diff --git a/AppKit/CPArrayController.j b/AppKit/CPArrayController.j
index f907ee032..15b3fa64b 100644
--- a/AppKit/CPArrayController.j
+++ b/AppKit/CPArrayController.j
@@ -1114,6 +1114,7 @@
     }
 
     var isPlaceholder = CPIsControllerMarker(newValue);
+
     if (isPlaceholder)
     {
         if (newValue === CPNotApplicableMarker && [options objectForKey:CPRaisesForNotApplicableKeysBindingOption])
diff --git a/AppKit/CPBox.j b/AppKit/CPBox.j
index 9c5d2aecf..5876d4689 100644
--- a/AppKit/CPBox.j
+++ b/AppKit/CPBox.j
@@ -421,9 +421,9 @@ CPBelowBottom = 6;
             // NSBox does not include a horizontal flag for the separator type. We have to determine
             // the type of separator to draw by the width and height of the frame.
             if (CGRectGetWidth(bounds) === 5.0)
-                return [self _drawVerticalSeperatorInRect:bounds];
+                return [self _drawVerticalSeparatorInRect:bounds];
             else if (CGRectGetHeight(bounds) === 5.0)
-                return [self _drawHorizontalSeperatorInRect:bounds];
+                return [self _drawHorizontalSeparatorInRect:bounds];
 
             break;
     }
@@ -462,7 +462,7 @@ CPBelowBottom = 6;
     }
 }
 
-- (void)_drawHorizontalSeperatorInRect:(CGRect)aRect
+- (void)_drawHorizontalSeparatorInRect:(CGRect)aRect
 {
     var context = [[CPGraphicsContext currentContext] graphicsPort];
 
@@ -474,7 +474,7 @@ CPBelowBottom = 6;
     CGContextStrokePath(context);
 }
 
-- (void)_drawVerticalSeperatorInRect:(CGRect)aRect
+- (void)_drawVerticalSeparatorInRect:(CGRect)aRect
 {
     var context = [[CPGraphicsContext currentContext] graphicsPort];
 
@@ -534,9 +534,9 @@ CPBelowBottom = 6;
         borderWidth = [self borderWidth],
         shadowOffset = [self valueForThemeAttribute:@"inner-shadow-offset"],
         shadowSize = [self valueForThemeAttribute:@"inner-shadow-size"],
-        shadowColor = [self valueForThemeAttribute:@"inner-shadow-color"];
+        shadowColor = [self valueForThemeAttribute:@"inner-shadow-color"],
+        baseRect = aRect;
 
-    var baseRect = aRect;
     aRect = CGRectInset(aRect, borderWidth / 2.0, borderWidth / 2.0);
 
     CGContextSaveGState(context);
diff --git a/AppKit/CPComboBox.j b/AppKit/CPComboBox.j
index 781c323fc..f94c27135 100644
--- a/AppKit/CPComboBox.j
+++ b/AppKit/CPComboBox.j
@@ -1155,11 +1155,13 @@ var CPComboBoxCompletionTest = function(object, index, context)
 
     switch (theBinding)
     {
-        case CPContentBinding:          [_source setContent:newValue];
-                                        break;
+        case CPContentBinding:
+            [_source setContent:newValue];
+            break;
 
-        case CPContentValuesBinding:    [_source setContentValues:newValue];
-                                        break;
+        case CPContentValuesBinding:
+            [_source setContentValues:newValue];
+            break;
     }
 }
 
diff --git a/AppKit/Themes/Aristo2/ThemeDescriptors.j b/AppKit/Themes/Aristo2/ThemeDescriptors.j
index b298a6d6c..11a9977e9 100644
--- a/AppKit/Themes/Aristo2/ThemeDescriptors.j
+++ b/AppKit/Themes/Aristo2/ThemeDescriptors.j
@@ -1550,7 +1550,7 @@ var themedButtonValues = nil,
 
 + (CPProgressIndicator)themedBarProgressIndicator
 {
-    var progressBar = [[CPProgressIndicator alloc] initWithFrame:CGRectMake(0,0,75,25)];
+    var progressBar = [[CPProgressIndicator alloc] initWithFrame:CGRectMake(0, 0, 75, 25)];
     [progressBar setDoubleValue:30];
 
     var bezelColor = PatternColor(
@@ -1582,7 +1582,7 @@ var themedButtonValues = nil,
 
 + (CPProgressIndicator)themedIndeterminateBarProgressIndicator
 {
-    var progressBar = [[CPProgressIndicator alloc] initWithFrame:CGRectMake(0,0,75,25)];
+    var progressBar = [[CPProgressIndicator alloc] initWithFrame:CGRectMake(0, 0, 75, 25)];
 
     [progressBar setIndeterminate:YES];
 
@@ -1616,7 +1616,7 @@ var themedButtonValues = nil,
 
 + (CPProgressIndicator)themedSpinningProgressIndicator
 {
-    var progressBar = [[CPProgressIndicator alloc] initWithFrame:CGRectMake(0,0,64,64)];
+    var progressBar = [[CPProgressIndicator alloc] initWithFrame:CGRectMake(0, 0, 64, 64)];
     [progressBar setStyle:CPProgressIndicatorSpinningStyle];
 
     var spinningMini = PatternColor(@"progress-indicator-spinning-style-mini.gif", 16.0, 16.0),
@@ -1658,7 +1658,7 @@ var themedButtonValues = nil,
 
 + (CPLevelIndicator)themedLevelIndicator
 {
-    var levelIndicator = [[CPLevelIndicator alloc] initWithFrame:CGRectMake(0,0,100,100)],
+    var levelIndicator = [[CPLevelIndicator alloc] initWithFrame:CGRectMake(0, 0, 100, 100)],
 
         bezelColor = PatternColor(
             "level-indicator-bezel{position}.png",
diff --git a/Foundation/CPArray+KVO.j b/Foundation/CPArray+KVO.j
index ff17444f8..fc676fcde 100644
--- a/Foundation/CPArray+KVO.j
+++ b/Foundation/CPArray+KVO.j
@@ -528,7 +528,7 @@
  Raises an exception.
 
  CPArray objects are not observable, so this method raises an exception when invoked on an CPArray object.
- Instead of observing a array, observe the ordered to-many relationship for which the array is the collection of related objects.
+ Instead of observing an array, observe the ordered to-many relationship for which the array is the collection of related objects.
 */
 - (void)addObserver:(id)anObserver forKeyPath:(CPString)aKeyPath options:(CPKeyValueObservingOptions)anOptions context:(id)aContext
 {
@@ -539,7 +539,7 @@
  Raises an exception.
 
  CPArray objects are not observable, so this method raises an exception when invoked on an CPArray object.
- Instead of observing a array, observe the ordered to-many relationship for which the array is the collection of related objects.
+ Instead of observing an array, observe the ordered to-many relationship for which the array is the collection of related objects.
 */
 - (void)removeObserver:(id)anObserver forKeyPath:(CPString)aKeyPath
 {