@@ -71,19 +71,17 @@
 {
 	return (id)[[OFMapTableDictionary alloc]
 	    initWithDictionary: dictionary];
 }
 
-- (instancetype)initWithObject: (id)object
-			forKey: (id)key
+- (instancetype)initWithObject: (id)object forKey: (id)key
 {
 	return (id)[[OFMapTableDictionary alloc] initWithObject: object
 							 forKey: key];
 }
 
-- (instancetype)initWithObjects: (OFArray *)objects
-			forKeys: (OFArray *)keys
+- (instancetype)initWithObjects: (OFArray *)objects forKeys: (OFArray *)keys
 {
 	return (id)[[OFMapTableDictionary alloc] initWithObjects: objects
 							 forKeys: keys];
 }
 
@@ -226,15 +224,13 @@
 {
 	return [[(OFDictionary *)[self alloc]
 	    initWithDictionary: dictionary] autorelease];
 }
 
-+ (instancetype)dictionaryWithObject: (id)object
-			      forKey: (id)key
++ (instancetype)dictionaryWithObject: (id)object forKey: (id)key
 {
-	return [[[self alloc] initWithObject: object
-				      forKey: key] autorelease];
+	return [[[self alloc] initWithObject: object forKey: key] autorelease];
 }
 
 + (instancetype)dictionaryWithObjects: (OFArray *)objects
 			      forKeys: (OFArray *)keys
 {
@@ -242,11 +238,11 @@
 				      forKeys: keys] autorelease];
 }
 
 + (instancetype)dictionaryWithObjects: (id const *)objects
 			      forKeys: (id const *)keys
-		  count: (size_t)count
+				count: (size_t)count
 {
 	return [[[self alloc] initWithObjects: objects
 				      forKeys: keys
 					count: count] autorelease];
 }
@@ -283,12 +279,11 @@
 - (instancetype)initWithDictionary: (OFDictionary *)dictionary
 {
 	OF_INVALID_INIT_METHOD
 }
 
-- (instancetype)initWithObject: (id)object
-			forKey: (id)key
+- (instancetype)initWithObject: (id)object forKey: (id)key
 {
 	if (key == nil || object == nil)
 		@throw [OFInvalidArgumentException exception];
 
 	return [self initWithKeysAndObjects: key, object, nil];
@@ -310,13 +305,11 @@
 	} @catch (id e) {
 		[self release];
 		@throw e;
 	}
 
-	return [self initWithObjects: objects
-			     forKeys: keys
-			       count: count];
+	return [self initWithObjects: objects forKeys: keys count: count];
 }
 
 - (instancetype)initWithObjects: (id const *)objects
 			forKeys: (id const *)keys
 			  count: (size_t)count
@@ -328,12 +321,11 @@
 {
 	id ret;
 	va_list arguments;
 
 	va_start(arguments, firstKey);
-	ret = [self initWithKey: firstKey
-		      arguments: arguments];
+	ret = [self initWithKey: firstKey arguments: arguments];
 	va_end(arguments);
 
 	return ret;
 }
 
@@ -832,19 +824,17 @@
 	} else if (count <= UINT16_MAX) {
 		uint8_t type = 0xDE;
 		uint16_t tmp = OF_BSWAP16_IF_LE((uint16_t)count);
 
 		[data addItem: &type];
-		[data addItems: &tmp
-			 count: sizeof(tmp)];
+		[data addItems: &tmp count: sizeof(tmp)];
 	} else if (count <= UINT32_MAX) {
 		uint8_t type = 0xDF;
 		uint32_t tmp = OF_BSWAP32_IF_LE((uint32_t)count);
 
 		[data addItem: &type];
-		[data addItems: &tmp
-			 count: sizeof(tmp)];
+		[data addItems: &tmp count: sizeof(tmp)];
 	} else
 		@throw [OFOutOfRangeException exception];
 
 	pool = objc_autoreleasePoolPush();