@@ -219,12 +219,11 @@
 	    isEqual: @"chunked"];
 
 	objc_autoreleasePoolPop(pool);
 }
 
-- (size_t)lowlevelWriteBuffer: (const void *)buffer
-		       length: (size_t)length
+- (size_t)lowlevelWriteBuffer: (const void *)buffer length: (size_t)length
 {
 	/* TODO: Use non-blocking writes */
 
 	void *pool;
 
@@ -233,19 +232,17 @@
 
 	if (!_headersSent)
 		[self of_sendHeaders];
 
 	if (!_chunked)
-		return [_socket writeBuffer: buffer
-				     length: length];
+		return [_socket writeBuffer: buffer length: length];
 
 	pool = objc_autoreleasePoolPush();
 	[_socket writeString: [OFString stringWithFormat: @"%zX\r\n", length]];
 	objc_autoreleasePoolPop(pool);
 
-	[_socket writeBuffer: buffer
-		      length: length];
+	[_socket writeBuffer: buffer length: length];
 	[_socket writeString: @"\r\n"];
 
 	return length;
 }
 
@@ -497,19 +494,17 @@
 
 - (bool)sendErrorAndClose: (short)statusCode
 {
 	OFString *date = [[OFDate date]
 	    dateStringWithFormat: @"%a, %d %b %Y %H:%M:%S GMT"];
-
 	[_socket writeFormat: @"HTTP/1.1 %hd %@\r\n"
 			      @"Date: %@\r\n"
 			      @"Server: %@\r\n"
 			      @"\r\n",
 			      statusCode,
 			      of_http_status_code_to_string(statusCode),
 			      date, _server.name];
-
 	return false;
 }
 
 - (void)createResponse
 {
@@ -610,12 +605,11 @@
 - (bool)lowlevelIsAtEndOfStream
 {
 	return _atEndOfStream;
 }
 
-- (size_t)lowlevelReadIntoBuffer: (void *)buffer
-			  length: (size_t)length
+- (size_t)lowlevelReadIntoBuffer: (void *)buffer length: (size_t)length
 {
 	if (_socket == nil)
 		@throw [OFNotOpenException exceptionWithObject: self];
 
 	if (_atEndOfStream)
@@ -629,12 +623,11 @@
 		size_t ret;
 
 		if (length > (unsigned long long)_toRead)
 			length = (size_t)_toRead;
 
-		ret = [_socket readIntoBuffer: buffer
-				       length: length];
+		ret = [_socket readIntoBuffer: buffer length: length];
 
 		_toRead -= ret;
 
 		if (_toRead == 0)
 			_atEndOfStream = true;
@@ -644,12 +637,11 @@
 
 	/* Chunked */
 	if (_toRead == -2) {
 		char tmp[2];
 
-		switch ([_socket readIntoBuffer: tmp
-					 length: 2]) {
+		switch ([_socket readIntoBuffer: tmp length: 2]) {
 		case 2:
 			_toRead++;
 			if (tmp[1] != '\n')
 				@throw [OFInvalidFormatException exception];
 		case 1:
@@ -663,12 +655,11 @@
 
 		return 0;
 	} else if (_toRead == -1) {
 		char tmp;
 
-		if ([_socket readIntoBuffer: &tmp
-				     length: 1] == 1) {
+		if ([_socket readIntoBuffer: &tmp length: 1] == 1) {
 			_toRead++;
 			if (tmp != '\n')
 				@throw [OFInvalidFormatException exception];
 		}
 
@@ -678,15 +669,13 @@
 		return 0;
 	} else if (_toRead > 0) {
 		if (length > (unsigned long long)_toRead)
 			length = (size_t)_toRead;
 
-		length = [_socket readIntoBuffer: buffer
-					  length: length];
+		length = [_socket readIntoBuffer: buffer length: length];
 
 		_toRead -= length;
-
 		if (_toRead == 0)
 			_toRead = -2;
 
 		return length;
 	} else {
@@ -930,12 +919,11 @@
 		TLSSocket.privateKeyFile = _privateKeyFile;
 		TLSSocket.privateKeyPassphrase = _privateKeyPassphrase;
 	} else
 		_listeningSocket = [[OFTCPSocket alloc] init];
 
-	_port = [_listeningSocket bindToHost: _host
-					port: _port];
+	_port = [_listeningSocket bindToHost: _host port: _port];
 	[_listeningSocket listen];
 
 #ifdef OF_HAVE_THREADS
 	if (_numberOfThreads > 1) {
 		OFMutableArray *threads =
@@ -993,11 +981,11 @@
 	if (exception != nil) {
 		if (![_delegate respondsToSelector:
 		    @selector(server:didReceiveExceptionOnListeningSocket:)])
 			return false;
 
-		return [_delegate		  server: self
+		return [_delegate server: self
 		    didReceiveExceptionOnListeningSocket: exception];
 	}
 
 #ifdef OF_HAVE_THREADS
 	if (_numberOfThreads > 1) {