diff --git a/dev/codesniffer/ruleset.xml b/dev/codesniffer/ruleset.xml
index 663dee5db38..6b498e7d167 100755
--- a/dev/codesniffer/ruleset.xml
+++ b/dev/codesniffer/ruleset.xml
@@ -11,10 +11,16 @@
 		
 	<!-- List of all tests -->
 
+	
+	<!-- Rules from Internal Standard -->
+	
 	<rule ref="Internal.NoCodeFound">
 		<severity>0</severity>
 	</rule>
 
+	
+	<!-- Rules from Generic Standard -->
+		
 	<rule ref="Generic.CodeAnalysis.EmptyStatement" />
  
 	<rule ref="Generic.CodeAnalysis.EmptyStatement.NotAllowed">
@@ -24,9 +30,6 @@
 		<severity>0</severity>
 	</rule>
 
-    <!-- The closing ?> tag MUST be omitted from files containing only PHP. -->
-    <rule ref="Zend.Files.ClosingTag"/>
-
     <!-- <rule ref="Generic.CodeAnalysis.ForLoopShouldBeWhileLoop" /> -->
 
     <rule ref="Generic.CodeAnalysis.ForLoopWithTestFunctionCall" />
@@ -153,6 +156,10 @@
 	<!-- Disabled as this does not support tab -->
 	<!-- <rule ref="Generic.WhiteSpace.ScopeIndent" /> -->
 
+
+
+	<!-- Rules from PEAR Standard -->
+
 	<rule ref="PEAR.Classes.ClassDeclaration" />
 
     <!-- Check for duplicate class names -->
@@ -270,4 +277,10 @@
     <!-- Already found as a Generic rule -->
 	<!-- <rule ref="PEAR.WhiteSpace.ScopeIndent" /> -->
 
+
+	<!-- Rules from Zend Standard-->
+
+    <!-- The closing ?> tag MUST be omitted from files containing only PHP. -->
+    <rule ref="Zend.Files.ClosingTag"/>
+
 </ruleset>