diff --git a/app/Config/Schema/i18n.php b/app/Config/Schema/i18n.php
index 8de0052dd..5f62427ce 100644
--- a/app/Config/Schema/i18n.php
+++ b/app/Config/Schema/i18n.php
@@ -1,11 +1,5 @@
 <?php
 /**
- * This is i18n Schema file
- *
- * Use it to configure database for i18n
- *
- * PHP 5
- *
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2012, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
@@ -19,13 +13,15 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 
-/*
+/**
  *
  * Using the Schema command line utility
- * cake schema run create i18n
  *
+ * Use it to configure database for i18n
+ *
+ * cake schema run create i18n
  */
-class i18nSchema extends CakeSchema {
+class I18nSchema extends CakeSchema {
 
 	public $name = 'i18n';
 
diff --git a/app/webroot/index.php b/app/webroot/index.php
index 936bc9a00..b06dda684 100644
--- a/app/webroot/index.php
+++ b/app/webroot/index.php
@@ -72,7 +72,7 @@ if (!defined('WWW_ROOT')) {
 
 // for built-in server
 if (php_sapi_name() == 'cli-server') {
-	$_SERVER['PHP_SELF'] = '/'.basename(__FILE__);
+	$_SERVER['PHP_SELF'] = '/' . basename(__FILE__);
 }
 
 if (!defined('CAKE_CORE_INCLUDE_PATH')) {
diff --git a/lib/Cake/Console/Templates/skel/webroot/index.php b/lib/Cake/Console/Templates/skel/webroot/index.php
index be4797877..205c4b6e0 100644
--- a/lib/Cake/Console/Templates/skel/webroot/index.php
+++ b/lib/Cake/Console/Templates/skel/webroot/index.php
@@ -74,7 +74,7 @@ if (!defined('WWW_ROOT')) {
 
 // for built-in server
 if (php_sapi_name() == 'cli-server') {
-	$_SERVER['PHP_SELF'] = '/'.basename(__FILE__);
+	$_SERVER['PHP_SELF'] = '/' . basename(__FILE__);
 }
 
 if (!defined('CAKE_CORE_INCLUDE_PATH')) {
diff --git a/lib/Cake/Test/Case/Utility/ValidationTest.php b/lib/Cake/Test/Case/Utility/ValidationTest.php
index 4ea1d15c6..ddd07df21 100644
--- a/lib/Cake/Test/Case/Utility/ValidationTest.php
+++ b/lib/Cake/Test/Case/Utility/ValidationTest.php
@@ -1785,7 +1785,7 @@ class ValidationTest extends CakeTestCase {
 		$this->assertTrue(Validation::url('http://underscore_subdomain.example.org'));
 		$this->assertTrue(Validation::url('http://_jabber._tcp.gmail.com'));
 		$this->assertFalse(Validation::url('http://www.underscore_domain.org'));
-		$this->assertFalse(Validation::url('http://_jabber._tcp.g_mail.com'));		
+		$this->assertFalse(Validation::url('http://_jabber._tcp.g_mail.com'));
 
 		$this->assertTrue(Validation::url('http://example.com/~userdir/subdir/index.html'));
 		$this->assertTrue(Validation::url('http://www.zwischenraume.de'));