diff --git a/tools/build/conf/src/main/resources/onos/checkstyle.xml b/tools/build/conf/src/main/resources/onos/checkstyle.xml
index 9765196..65e23d4 100644
--- a/tools/build/conf/src/main/resources/onos/checkstyle.xml
+++ b/tools/build/conf/src/main/resources/onos/checkstyle.xml
@@ -56,7 +56,6 @@
 -->
 
 
-
 <module name="Checker">
     <!--
         If you set the basedir property below, then all reported file
@@ -108,19 +107,21 @@
     <!-- </module> -->
 
     <module name="SuppressionCommentFilter">
-        <property name="offCommentFormat" value="(CHECKSTYLE\:OFF|Generated by the protocol buffer compiler.)"/>
+        <property name="offCommentFormat"
+                  value="(CHECKSTYLE\:OFF|Generated by the protocol buffer compiler.)"/>
         <property name="onCommentFormat" value="CHECKSTYLE:ON"/>
     </module>
 
     <module name="SuppressWithNearbyCommentFilter">
-        <property name="commentFormat" value="CHECKSTYLE IGNORE THIS LINE" />
-        <property name="checkFormat" value=".*" />
-        <property name="influenceFormat" value="0" />
+        <property name="commentFormat" value="CHECKSTYLE IGNORE THIS LINE"/>
+        <property name="checkFormat" value=".*"/>
+        <property name="influenceFormat" value="0"/>
     </module>
 
     <!-- Example: // CHECKSTYLE IGNORE FinalClass FOR NEXT 1 LINES  -->
     <module name="SuppressWithNearbyCommentFilter">
-        <property name="commentFormat" value="CHECKSTYLE IGNORE (\w+) FOR NEXT (\d+) LINES"/>
+        <property name="commentFormat"
+                  value="CHECKSTYLE IGNORE (\w+) FOR NEXT (\d+) LINES"/>
         <property name="checkFormat" value="$1"/>
         <property name="influenceFormat" value="$2"/>
     </module>
@@ -144,7 +145,7 @@
             <property name="severity" value="warning"/>
         </module>
         <module name="JavadocStyle"/>
-	<!-- @author tag should not be used -->
+        <!-- @author tag should not be used -->
         <module name="WriteTag">
             <property name="tag" value="@author"/>
             <property name="tagFormat" value="\S"/>
@@ -153,7 +154,7 @@
         </module>
 
         <module name="AbbreviationAsWordInName">
-            <property name="allowedAbbreviationLength" value="2" />
+            <property name="allowedAbbreviationLength" value="2"/>
         </module>
 
         <!-- Checks for Naming Conventions.                  -->
@@ -179,7 +180,7 @@
         <!-- Checks for imports                              -->
         <!-- See http://checkstyle.sf.net/config_import.html -->
         <module name="AvoidStarImport">
-          <property name="allowStaticMemberImports" value="true"/>
+            <property name="allowStaticMemberImports" value="true"/>
         </module>
         <module name="IllegalImport"/>
         <!-- defaults to sun.* packages -->
@@ -222,7 +223,6 @@
         </module>
 
 
-
         <!-- Modifier Checks                                    -->
         <!-- See http://checkstyle.sf.net/config_modifiers.html -->
         <module name="ModifierOrder"/>
@@ -285,7 +285,6 @@
         </module>
 
 
-
         <!-- Miscellaneous other checks.                   -->
         <!-- See http://checkstyle.sf.net/config_misc.html -->
         <module name="ArrayTypeStyle"/>
@@ -296,8 +295,6 @@
         <!-- ONOS allows TODO markers in checked in source code -->
         <!-- <module name="TodoComment"/> -->
         <module name="UpperEll"/>
-
-
-      </module>
-
     </module>
+
+</module>