@@ -33,11 +33,11 @@
 #import "OFUnknownXMLEntityException.h"
 
 #import "TestsAppDelegate.h"
 
 static OFString *module = nil;
-static OFString* whitespace[] = {
+static OFString *whitespace[] = {
 	@" \r \t\n\t \tasd  \t \t\t\r\n",
 	@" \t\t  \t\t  \t \t"
 };
 static of_unichar_t ucstr[] = {
 	0xFEFF, 'f', 0xF6, 0xF6, 'b', 0xE4, 'r', 0x1F03A, 0
@@ -79,11 +79,11 @@
 	}
 
 	return self;
 }
 
-- initWithString: (OFString*)string
+- initWithString: (OFString *)string
 {
 	self = [super init];
 
 	@try {
 		_string = [string mutableCopy];
@@ -93,11 +93,11 @@
 	}
 
 	return self;
 }
 
-- initWithCString: (const char*)cString
+- initWithCString: (const char *)cString
 	 encoding: (of_string_encoding_t)encoding
 	   length: (size_t)length
 {
 	self = [super init];
 
@@ -111,11 +111,11 @@
 	}
 
 	return self;
 }
 
-- initWithUTF16String: (const of_char16_t*)UTF16String
+- initWithUTF16String: (const of_char16_t *)UTF16String
 	       length: (size_t)length
 	    byteOrder: (of_byte_order_t)byteOrder
 {
 	self = [super init];
 
@@ -130,11 +130,11 @@
 	}
 
 	return self;
 }
 
-- initWithUTF32String: (const of_char32_t*)UTF32String
+- initWithUTF32String: (const of_char32_t *)UTF32String
 	       length: (size_t)length
 	    byteOrder: (of_byte_order_t)byteOrder
 {
 	self = [super init];
 
@@ -149,11 +149,11 @@
 	}
 
 	return self;
 }
 
-- initWithFormat: (OFConstantString*)format
+- initWithFormat: (OFConstantString *)format
        arguments: (va_list)arguments
 {
 	self = [super init];
 
 	@try {
@@ -191,11 +191,11 @@
 	if (self == [SimpleMutableString class])
 		[self inheritMethodsFromClass: [SimpleString class]];
 }
 
 - (void)replaceCharactersInRange: (of_range_t)range
-		      withString: (OFString*)string
+		      withString: (OFString *)string
 {
 	[_string replaceCharactersInRange: range
 			       withString: string];
 }
 @end
@@ -202,12 +202,12 @@
 
 @interface EntityHandler: OFObject <OFStringXMLUnescapingDelegate>
 @end
 
 @implementation EntityHandler
--	   (OFString*)string: (OFString*)string
-  containsUnknownEntityNamed: (OFString*)entity
+-	  (OFString *)string: (OFString *)string
+  containsUnknownEntityNamed: (OFString *)entity
 {
 	if ([entity isEqual: @"foo"])
 		return @"bar";
 
 	return nil;
@@ -931,11 +931,11 @@
 	    isEqual: @"xbary"])
 
 #ifdef OF_HAVE_BLOCKS
 	TEST(@"-[stringByXMLUnescapingWithBlock:]",
 	    [[C(@"x&foo;y") stringByXMLUnescapingWithBlock:
-	        ^ OFString* (OFString *str, OFString *entity) {
+	        ^ OFString *(OFString *str, OFString *entity) {
 		    if ([entity isEqual: @"foo"])
 			    return @"bar";
 
 		    return nil;
 	    }] isEqual: @"xbary"])