@@ -42,11 +42,11 @@
 #import "OFWriteFailedException.h"
 
 static OF_INLINE void
 normalizeKey(char *str_)
 {
-	unsigned char *str = (unsigned char*)str_;
+	unsigned char *str = (unsigned char *)str_;
 	bool firstLetter = true;
 
 	while (*str != '\0') {
 		if (!of_ascii_isalpha(*str)) {
 			firstLetter = true;
@@ -68,16 +68,16 @@
 	OFTCPSocket *_socket;
 	bool _hasContentLength, _chunked, _keepAlive, _atEndOfStream;
 	size_t _toRead;
 }
 
-- initWithSocket: (OFTCPSocket*)socket;
+- initWithSocket: (OFTCPSocket *)socket;
 - (void)OF_setKeepAlive: (bool)keepAlive;
 @end
 
 @implementation OFHTTPClientResponse
-- initWithSocket: (OFTCPSocket*)socket
+- initWithSocket: (OFTCPSocket *)socket
 {
 	self = [super init];
 
 	_socket = [socket retain];
 
@@ -94,11 +94,11 @@
 	[_socket release];
 
 	[super dealloc];
 }
 
-- (void)setHeaders: (OFDictionary*)headers
+- (void)setHeaders: (OFDictionary *)headers
 {
 	OFString *contentLength;
 
 	[super setHeaders: headers];
 
@@ -125,11 +125,11 @@
 			@throw [OFInvalidServerReplyException exception];
 		}
 	}
 }
 
-- (size_t)lowlevelReadIntoBuffer: (void*)buffer
+- (size_t)lowlevelReadIntoBuffer: (void *)buffer
 			  length: (size_t)length
 {
 	if (_atEndOfStream)
 		@throw [OFReadFailedException exceptionWithObject: self
 						  requestedLength: length
@@ -275,17 +275,17 @@
 	[self close];
 
 	[super dealloc];
 }
 
-- (OFHTTPResponse*)performRequest: (OFHTTPRequest*)request
+- (OFHTTPResponse *)performRequest: (OFHTTPRequest *)request
 {
 	return [self performRequest: request
 			  redirects: 10];
 }
 
-- (OFTCPSocket*)OF_closeAndCreateSocketForRequest: (OFHTTPRequest*)request
+- (OFTCPSocket *)OF_closeAndCreateSocketForRequest: (OFHTTPRequest *)request
 {
 	OFURL *URL = [request URL];
 	OFTCPSocket *socket;
 
 	[self close];
@@ -310,27 +310,27 @@
 			 port: [URL port]];
 
 	return socket;
 }
 
-- (OFHTTPResponse*)performRequest: (OFHTTPRequest*)request
-			redirects: (size_t)redirects
+- (OFHTTPResponse *)performRequest: (OFHTTPRequest *)request
+			 redirects: (size_t)redirects
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFURL *URL = [request URL];
 	OFString *scheme = [URL scheme];
 	of_http_request_method_t method = [request method];
 	OFString *path;
 	OFMutableString *requestString;
 	OFString *user, *password;
-	OFMutableDictionary OF_GENERIC(OFString*, OFString*) *headers;
+	OFMutableDictionary OF_GENERIC(OFString *, OFString *) *headers;
 	OFDataArray *body = [request body];
 	OFTCPSocket *socket;
 	OFHTTPClientResponse *response;
 	OFString *line, *version, *redirect, *connectionHeader;
 	bool keepAlive;
-	OFMutableDictionary OF_GENERIC(OFString*, OFString*) *serverHeaders;
+	OFMutableDictionary OF_GENERIC(OFString *, OFString *) *serverHeaders;
 	OFEnumerator *keyEnumerator, *objectEnumerator;
 	OFString *key, *object;
 	int status;
 
 	if (![scheme isEqual: @"http"] && ![scheme isEqual: @"https"])