diff --git a/Model/GMAppKit.m b/Model/GMAppKit.m
index 7014fe980..5767ae24c 100644
--- a/Model/GMAppKit.m
+++ b/Model/GMAppKit.m
@@ -537,7 +537,7 @@ void __dummy_GMAppKit_functionForLinking() {}
 
   [archiver encodeObject:[self documentView] withName:@"documentView"];
   [archiver encodeBOOL:[self copiesOnScroll] withName:@"copiesOnScroll"];
-  if([self respondsToSelector: @selector(drawsBackground)])
+  if ([self respondsToSelector: @selector(drawsBackground)])
     [archiver encodeBOOL:[self drawsBackground] withName:@"drawsBackground"];
   [archiver encodeObject:[self backgroundColor] withName:@"backgroundColor"];
 }
@@ -548,7 +548,7 @@ void __dummy_GMAppKit_functionForLinking() {}
 
   [self setDocumentView:[unarchiver decodeObjectWithName:@"documentView"]];
   [self setCopiesOnScroll:[unarchiver decodeBOOLWithName:@"copiesOnScroll"]];
-  if([self respondsToSelector: @selector(setDrawsBackground:)])
+  if ([self respondsToSelector: @selector(setDrawsBackground:)])
     [self setDrawsBackground:[unarchiver decodeBOOLWithName:@"drawsBackground"]];
   [self setBackgroundColor:[unarchiver decodeObjectWithName:@"backgroundColor"]];
   return self;
@@ -1100,14 +1100,14 @@ void __dummy_GMAppKit_functionForLinking() {}
 - (void)encodeWithModelArchiver:(GMArchiver*)archiver
 {
   [super encodeWithModelArchiver:archiver];
-  if([self respondsToSelector: @selector(echosBullets)])
+  if ([self respondsToSelector: @selector(echosBullets)])
     [archiver encodeBOOL:[self echosBullets] withName:@"echosBullets"];
 }
 
 - (id)initWithModelUnarchiver:(GMUnarchiver*)unarchiver
 {
   self = [super initWithModelUnarchiver:unarchiver];
-  if([self respondsToSelector: @selector(setEchosBullets:)])
+  if ([self respondsToSelector: @selector(setEchosBullets:)])
     [self setEchosBullets:[unarchiver decodeBOOLWithName:@"echosBullets"]];
 
   return self;
diff --git a/Tools/GSspell.m b/Tools/GSspell.m
index e4391ca97..717848415 100644
--- a/Tools/GSspell.m
+++ b/Tools/GSspell.m
@@ -66,11 +66,11 @@ findMisspelledWordInString:(NSString *)stringToCheck
   NSRange r = NSMakeRange(0,0);
 
 #ifdef HAVE_ASPELL_H
-  if(countOnly)
+  if (countOnly)
     {
       NSScanner *inputScanner = [NSScanner scannerWithString: stringToCheck];
       [inputScanner setCharactersToBeSkipped: [NSCharacterSet whitespaceAndNewlineCharacterSet]];      
-      while(![inputScanner isAtEnd])
+      while (![inputScanner isAtEnd])
         {
           [inputScanner scanUpToCharactersFromSet: [NSCharacterSet whitespaceAndNewlineCharacterSet]
 			intoString: NULL];
@@ -112,7 +112,7 @@ findMisspelledWordInString:(NSString *)stringToCheck
     en = aspell_word_list_elements(list);
 
     // add them to the array.
-    while(!aspell_string_enumeration_at_end(en))
+    while (!aspell_string_enumeration_at_end(en))
       {
 	const char *string = aspell_string_enumeration_next(en);
 	NSString *word = [NSString stringWithUTF8String: string];
@@ -158,7 +158,7 @@ findMisspelledWordInString:(NSString *)stringToCheck
 - init
 {
   self = [super init];
-  if(self != nil)
+  if (self != nil)
     {
 #ifdef HAVE_ASPELL_H
       // initialization...