@@ -80,32 +80,32 @@
 + (instancetype)sharedLocalization
 {
 	return sharedLocalization;
 }
 
-+ (OFString*)language
++ (OFString *)language
 {
 	return [sharedLocalization language];
 }
 
-+ (OFString*)territory
++ (OFString *)territory
 {
 	return [sharedLocalization territory];
 }
 
 + (of_string_encoding_t)encoding
 {
 	return [sharedLocalization encoding];
 }
 
-+ (OFString*)decimalPoint
++ (OFString *)decimalPoint
 {
 	return [sharedLocalization decimalPoint];
 }
 
 #ifdef OF_HAVE_FILES
-+ (void)addLanguageDirectory: (OFString*)path
++ (void)addLanguageDirectory: (OFString *)path
 {
 	[sharedLocalization addLanguageDirectory: path];
 }
 #endif
 
@@ -161,11 +161,11 @@
 
 	[super dealloc];
 }
 
 #ifdef OF_HAVE_FILES
-- (void)addLanguageDirectory: (OFString*)path
+- (void)addLanguageDirectory: (OFString *)path
 {
 	void *pool;
 	OFString *mapPath, *language, *territory, *languageFile;
 	OFDictionary *map;
 
@@ -201,12 +201,12 @@
 
 	objc_autoreleasePoolPop(pool);
 }
 #endif
 
-- (OFString*)localizedStringForID: (OFConstantString*)ID
-			 fallback: (OFConstantString*)fallback, ...
+- (OFString *)localizedStringForID: (OFConstantString *)ID
+			  fallback: (OFConstantString *)fallback, ...
 {
 	OFString *ret;
 	va_list args;
 
 	va_start(args, fallback);
@@ -216,13 +216,13 @@
 	va_end(args);
 
 	return ret;
 }
 
-- (OFString*)localizedStringForID: (OFConstantString*)ID
-			 fallback: (OFConstantString*)fallback
-			arguments: (va_list)arguments
+- (OFString *)localizedStringForID: (OFConstantString *)ID
+			  fallback: (OFConstantString *)fallback
+			 arguments: (va_list)arguments
 {
 	OFMutableString *ret = [OFMutableString string];
 	void *pool = objc_autoreleasePoolPush();
 	const char *UTF8String = NULL;
 	size_t last, UTF8StringLength;
@@ -283,11 +283,11 @@
 				 * one or maybe two variables, meaning looping
 				 * is faster than constructing a dictionary.
 				 */
 				va_copy(argsCopy, arguments);
 				while ((name = va_arg(argsCopy,
-				    OFConstantString*)) != nil) {
+				    OFConstantString *)) != nil) {
 					id value = va_arg(argsCopy, id);
 
 					if (value == nil)
 						@throw
 						    [OFInvalidArgumentException