@@ -68,33 +68,28 @@
 @end
 
 @implementation OFLHAArchive
 @synthesize encoding = _encoding;
 
-+ (instancetype)archiveWithStream: (OFStream *)stream
-			     mode: (OFString *)mode
++ (instancetype)archiveWithStream: (OFStream *)stream mode: (OFString *)mode
 {
-	return [[[self alloc] initWithStream: stream
-					mode: mode] autorelease];
+	return [[[self alloc] initWithStream: stream mode: mode] autorelease];
 }
 
 #ifdef OF_HAVE_FILES
-+ (instancetype)archiveWithPath: (OFString *)path
-			   mode: (OFString *)mode
++ (instancetype)archiveWithPath: (OFString *)path mode: (OFString *)mode
 {
-	return [[[self alloc] initWithPath: path
-				      mode: mode] autorelease];
+	return [[[self alloc] initWithPath: path mode: mode] autorelease];
 }
 #endif
 
 - (instancetype)init
 {
 	OF_INVALID_INIT_METHOD
 }
 
-- (instancetype)initWithStream: (OFStream *)stream
-			  mode: (OFString *)mode
+- (instancetype)initWithStream: (OFStream *)stream mode: (OFString *)mode
 {
 	self = [super init];
 
 	@try {
 		_stream = [stream retain];
@@ -125,25 +120,21 @@
 
 	return self;
 }
 
 #ifdef OF_HAVE_FILES
-- (instancetype)initWithPath: (OFString *)path
-			mode: (OFString *)mode
+- (instancetype)initWithPath: (OFString *)path mode: (OFString *)mode
 {
 	OFFile *file;
 
 	if ([mode isEqual: @"a"])
-		file = [[OFFile alloc] initWithPath: path
-					       mode: @"r+"];
+		file = [[OFFile alloc] initWithPath: path mode: @"r+"];
 	else
-		file = [[OFFile alloc] initWithPath: path
-					       mode: mode];
+		file = [[OFFile alloc] initWithPath: path mode: mode];
 
 	@try {
-		self = [self initWithStream: file
-				       mode: mode];
+		self = [self initWithStream: file mode: mode];
 	} @finally {
 		[file release];
 	}
 
 	return self;
@@ -323,12 +314,11 @@
 		@throw [OFNotOpenException exceptionWithObject: self];
 
 	return _atEndOfStream;
 }
 
-- (size_t)lowlevelReadIntoBuffer: (void *)buffer
-			  length: (size_t)length
+- (size_t)lowlevelReadIntoBuffer: (void *)buffer length: (size_t)length
 {
 	size_t ret;
 
 	if (_stream == nil)
 		@throw [OFNotOpenException exceptionWithObject: self];
@@ -340,12 +330,11 @@
 		@throw [OFTruncatedDataException exception];
 
 	if (length > _toRead)
 		length = _toRead;
 
-	ret = [_decompressedStream readIntoBuffer: buffer
-					   length: length];
+	ret = [_decompressedStream readIntoBuffer: buffer length: length];
 
 	_toRead -= ret;
 	_CRC16 = of_crc16(_CRC16, buffer, ret);
 
 	if (_toRead == 0) {
@@ -415,12 +404,11 @@
 			size_t min = toRead;
 
 			if (min > 512)
 				min = 512;
 
-			toRead -= [stream readIntoBuffer: buffer
-						  length: min];
+			toRead -= [stream readIntoBuffer: buffer length: min];
 		}
 	}
 
 	_toRead = 0;
 	_skipped = true;
@@ -452,14 +440,12 @@
 
 	@try {
 		_entry = [entry mutableCopy];
 		_encoding = encoding;
 
-		_headerOffset = [stream seekToOffset: 0
-					       whence: SEEK_CUR];
-		[_entry of_writeToStream: stream
-				encoding: _encoding];
+		_headerOffset = [stream seekToOffset: 0 whence: SEEK_CUR];
+		[_entry of_writeToStream: stream encoding: _encoding];
 
 		/*
 		 * Retain stream last, so that -[close] called by -[dealloc]
 		 * doesn't write in case of an error.
 		 */
@@ -480,12 +466,11 @@
 	[_entry release];
 
 	[super dealloc];
 }
 
-- (size_t)lowlevelWriteBuffer: (const void *)buffer
-		       length: (size_t)length
+- (size_t)lowlevelWriteBuffer: (const void *)buffer length: (size_t)length
 {
 	uint32_t bytesWritten;
 
 	if (_stream == nil)
 		@throw [OFNotOpenException exceptionWithObject: self];
@@ -532,20 +517,16 @@
 
 	_entry.uncompressedSize = _bytesWritten;
 	_entry.compressedSize = _bytesWritten;
 	_entry.CRC16 = _CRC16;
 
-	offset = [_stream seekToOffset: 0
-				whence:SEEK_CUR];
-	[_stream seekToOffset: _headerOffset
-		       whence: SEEK_SET];
-	[_entry of_writeToStream: _stream
-			encoding: _encoding];
-	[_stream seekToOffset: offset
-		       whence: SEEK_SET];
+	offset = [_stream seekToOffset: 0 whence: SEEK_CUR];
+	[_stream seekToOffset: _headerOffset whence: SEEK_SET];
+	[_entry of_writeToStream: _stream encoding: _encoding];
+	[_stream seekToOffset: offset whence: SEEK_SET];
 
 	[_stream release];
 	_stream = nil;
 
 	[super close];
 }
 @end