diff --git a/lib/Cake/Model/Behavior/TreeBehavior.php b/lib/Cake/Model/Behavior/TreeBehavior.php
index b18b998bb..f65fdc553 100644
--- a/lib/Cake/Model/Behavior/TreeBehavior.php
+++ b/lib/Cake/Model/Behavior/TreeBehavior.php
@@ -673,7 +673,7 @@ class TreeBehavior extends ModelBehavior {
 		$hasChildren = (bool)$children;
 
 		if (!is_null($parentId)) {
-			if($hasChildren) {
+			if ($hasChildren) {
 				$Model->updateAll(
 					array($this->settings[$Model->alias]['left'] => $counter),
 					array($Model->escapeField() => $parentId)
diff --git a/lib/Cake/Test/Case/Controller/Component/Auth/BasicAuthenticateTest.php b/lib/Cake/Test/Case/Controller/Component/Auth/BasicAuthenticateTest.php
index f5cf217fa..837758031 100644
--- a/lib/Cake/Test/Case/Controller/Component/Auth/BasicAuthenticateTest.php
+++ b/lib/Cake/Test/Case/Controller/Component/Auth/BasicAuthenticateTest.php
@@ -139,7 +139,8 @@ class BasicAuthenticateTest extends CakeTestCase {
 
 		try {
 			$this->auth->unauthenticated($request, $this->response);
-		} catch (UnauthorizedException $e) {}
+		} catch (UnauthorizedException $e) {
+		}
 
 		$this->assertNotEmpty($e);
 
diff --git a/lib/Cake/Test/Case/Controller/Component/Auth/DigestAuthenticateTest.php b/lib/Cake/Test/Case/Controller/Component/Auth/DigestAuthenticateTest.php
index b1460a75a..1baefcb25 100644
--- a/lib/Cake/Test/Case/Controller/Component/Auth/DigestAuthenticateTest.php
+++ b/lib/Cake/Test/Case/Controller/Component/Auth/DigestAuthenticateTest.php
@@ -137,7 +137,8 @@ DIGEST;
 
 		try {
 			$this->auth->unauthenticated($request, $this->response);
-		} catch (UnauthorizedException $e) {}
+		} catch (UnauthorizedException $e) {
+		}
 
 		$this->assertNotEmpty($e);
 
diff --git a/lib/Cake/Test/Case/View/Helper/TextHelperTest.php b/lib/Cake/Test/Case/View/Helper/TextHelperTest.php
index 20c8728d7..2b04d3ba2 100644
--- a/lib/Cake/Test/Case/View/Helper/TextHelperTest.php
+++ b/lib/Cake/Test/Case/View/Helper/TextHelperTest.php
@@ -345,24 +345,24 @@ class TextHelperTest extends CakeTestCase {
 <p>This is a test text</p>
 
 TEXT;
-    		$result = $this->Text->autoParagraph($text);
-    		$text = 'This is a <br/> <BR> test text';
-    		$expected = <<<TEXT
+		$result = $this->Text->autoParagraph($text);
+		$text = 'This is a <br/> <BR> test text';
+		$expected = <<<TEXT
 <p>This is a </p>
 <p> test text</p>
 
 TEXT;
-    		$result = $this->Text->autoParagraph($text);
-    		$this->assertEquals($expected, $result);
-    		$result = $this->Text->autoParagraph($text);
-    		$text = 'This is a <BR id="test"/><br class="test"> test text';
-    		$expected = <<<TEXT
+		$result = $this->Text->autoParagraph($text);
+		$this->assertEquals($expected, $result);
+		$result = $this->Text->autoParagraph($text);
+		$text = 'This is a <BR id="test"/><br class="test"> test text';
+		$expected = <<<TEXT
 <p>This is a </p>
 <p> test text</p>
 
 TEXT;
-    		$result = $this->Text->autoParagraph($text);
-    		$this->assertEquals($expected, $result);
+		$result = $this->Text->autoParagraph($text);
+		$this->assertEquals($expected, $result);
 		$text = <<<TEXT
 This is a test text.
 This is a line return.
diff --git a/lib/Cake/Utility/Validation.php b/lib/Cake/Utility/Validation.php
index 7b5777d76..128d8e424 100644
--- a/lib/Cake/Utility/Validation.php
+++ b/lib/Cake/Utility/Validation.php
@@ -618,8 +618,7 @@ class Validation {
 			switch ($country) {
 				case 'us':
 				case 'ca':
-				// deprecated three-letter-code
-				case 'can':
+				case 'can': // deprecated three-letter-code
 				case 'all':
 					// includes all NANPA members.
 					// see http://en.wikipedia.org/wiki/North_American_Numbering_Plan#List_of_NANPA_countries_and_territories
diff --git a/lib/Cake/View/Helper/TextHelper.php b/lib/Cake/View/Helper/TextHelper.php
index d5df9288f..4d4d61d0c 100644
--- a/lib/Cake/View/Helper/TextHelper.php
+++ b/lib/Cake/View/Helper/TextHelper.php
@@ -250,7 +250,7 @@ class TextHelper extends AppHelper {
 		}
 		return $text;
 	}
-  
+
 /**
  * @see String::stripLinks()
  *