@@ -210,11 +210,11 @@
 - init
 {
 	OF_INVALID_INIT_METHOD
 }
 
-- (instancetype)OF_initWithFireDate: (OFDate*)fireDate
+- (instancetype)OF_initWithFireDate: (OFDate *)fireDate
 			   interval: (of_time_interval_t)interval
 			     target: (id)target
 			   selector: (SEL)selector
 			     object: (id)object1
 			     object: (id)object2
@@ -242,11 +242,11 @@
 	}
 
 	return self;
 }
 
-- initWithFireDate: (OFDate*)fireDate
+- initWithFireDate: (OFDate *)fireDate
 	  interval: (of_time_interval_t)interval
 	    target: (id)target
 	  selector: (SEL)selector
 	   repeats: (bool)repeats
 {
@@ -258,11 +258,11 @@
 				  object: nil
 			       arguments: 0
 				 repeats: repeats];
 }
 
-- initWithFireDate: (OFDate*)fireDate
+- initWithFireDate: (OFDate *)fireDate
 	  interval: (of_time_interval_t)interval
 	    target: (id)target
 	  selector: (SEL)selector
 	    object: (id)object
 	   repeats: (bool)repeats
@@ -275,11 +275,11 @@
 				  object: nil
 			       arguments: 1
 				 repeats: repeats];
 }
 
-- initWithFireDate: (OFDate*)fireDate
+- initWithFireDate: (OFDate *)fireDate
 	  interval: (of_time_interval_t)interval
 	    target: (id)target
 	  selector: (SEL)selector
 	    object: (id)object1
 	    object: (id)object2
@@ -294,11 +294,11 @@
 			       arguments: 2
 				 repeats: repeats];
 }
 
 #ifdef OF_HAVE_BLOCKS
-- initWithFireDate: (OFDate*)fireDate
+- initWithFireDate: (OFDate *)fireDate
 	   interval: (of_time_interval_t)interval
 	    repeats: (bool)repeats
 	      block: (of_timer_block_t)block
 {
 	self = [super init];
@@ -348,11 +348,11 @@
 	OFTimer *timer;
 
 	if (![object isKindOfClass: [OFTimer class]])
 		@throw [OFInvalidArgumentException exception];
 
-	timer = (OFTimer*)object;
+	timer = (OFTimer *)object;
 
 	return [_fireDate compare: timer->_fireDate];
 }
 
 - (void)fire
@@ -408,16 +408,16 @@
 #endif
 
 	objc_autoreleasePoolPop(pool);
 }
 
-- (OFDate*)fireDate
+- (OFDate *)fireDate
 {
 	return [[_fireDate copy] autorelease];
 }
 
-- (void)setFireDate: (OFDate*)fireDate
+- (void)setFireDate: (OFDate *)fireDate
 {
 	[self retain];
 	@try {
 		@synchronized (self) {
 			OFDate *old;