diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/StringArrayReader.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/StringArrayReader.java
index 409acbeb3..492e04d3e 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/StringArrayReader.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/StringArrayReader.java
@@ -116,8 +116,8 @@ class StringArrayReader extends Reader
             return '\n';
         }
 
-        if (mArrayIdx < mUnderlyingArray.length
-            && mStringIdx < mUnderlyingArray[mArrayIdx].length() )
+        if ((mArrayIdx < mUnderlyingArray.length)
+            && (mStringIdx < mUnderlyingArray[mArrayIdx].length()))
         {
             // this is the common case,
             // avoid char[] creation in super.read for performance
diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/AbstractOptionCheck.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/AbstractOptionCheck.java
index 447b389fc..2b4ee6458 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/AbstractOptionCheck.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/AbstractOptionCheck.java
@@ -16,14 +16,11 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ////////////////////////////////////////////////////////////////////////////////
-
 package com.puppycrawl.tools.checkstyle.checks;
 
 import org.apache.commons.beanutils.ConversionException;
 
 import com.puppycrawl.tools.checkstyle.api.Check;
-import com.puppycrawl.tools.checkstyle.api.DetailAST;
-import com.puppycrawl.tools.checkstyle.api.TokenTypes;
 
 /**
  * Abstract class for checks with options.
diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/EmptyBlockCheck.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/EmptyBlockCheck.java
index 8e47dbf43..758ec888b 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/EmptyBlockCheck.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/EmptyBlockCheck.java
@@ -16,10 +16,8 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ////////////////////////////////////////////////////////////////////////////////
-
 package com.puppycrawl.tools.checkstyle.checks;
 
-import com.puppycrawl.tools.checkstyle.api.Check;
 import com.puppycrawl.tools.checkstyle.api.DetailAST;
 import com.puppycrawl.tools.checkstyle.api.TokenTypes;
 
@@ -45,22 +43,22 @@ public class EmptyBlockCheck extends AbstractOptionCheck
             TokenTypes.STATIC_INIT,
             // TODO: need to handle....
             //TokenTypes.LITERAL_SWITCH,
-            //TODO: does this handle TokenTypes.LITERAL_SYNCHRONIZED?      
+            //TODO: does this handle TokenTypes.LITERAL_SYNCHRONIZED?
         };
     }
-        
+
     /** @see com.puppycrawl.tools.checkstyle.api.Check */
     public void visitToken(DetailAST aAST)
     {
         final DetailAST slistAST = aAST.findFirstToken(TokenTypes.SLIST);
         if (slistAST != null) {
             if (mOption == BlockOption.STMT) {
-                if (slistAST.getChildCount() <= 1) {      
+                if (slistAST.getChildCount() <= 1) {
                     log(slistAST.getLineNo(),
                         slistAST.getColumnNo(),
                         "block.noStmt",
                         aAST.getText());
-                }   
+                }
             }
             else if (mOption == BlockOption.TEXT) {
                 if (!hasText(slistAST)) {
@@ -76,7 +74,7 @@ public class EmptyBlockCheck extends AbstractOptionCheck
     private boolean hasText(final DetailAST slistAST)
     {
         boolean retVal = false;
-        
+
         final DetailAST rcurlyAST = slistAST.findFirstToken(TokenTypes.RCURLY);
         if (rcurlyAST != null) {
             final int slistLineNo = slistAST.getLineNo();
@@ -103,8 +101,7 @@ public class EmptyBlockCheck extends AbstractOptionCheck
                 }
                 else {
                     // check if all lines are also only whitespace
-                    for (int i = slistLineNo; i < (rcurlyLineNo - 1); i++)
-                    {
+                    for (int i = slistLineNo; i < (rcurlyLineNo - 1); i++) {
                         if (lines[i].trim().length() > 0) {
                             retVal = true;
                             break;
@@ -112,7 +109,7 @@ public class EmptyBlockCheck extends AbstractOptionCheck
                     }
                 }
             }
-        }               
+        }
         return retVal;
     }
 }
diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/LeftCurlyCheck.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/LeftCurlyCheck.java
index 45e72f5d8..36c57bda3 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/LeftCurlyCheck.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/LeftCurlyCheck.java
@@ -8,7 +8,6 @@
  */
 package com.puppycrawl.tools.checkstyle.checks;
 
-import com.puppycrawl.tools.checkstyle.api.Check;
 import com.puppycrawl.tools.checkstyle.api.DetailAST;
 import com.puppycrawl.tools.checkstyle.api.Utils;
 
diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/ParenPadCheck.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/ParenPadCheck.java
index eb4dd5fec..ce1460f21 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/ParenPadCheck.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/ParenPadCheck.java
@@ -19,11 +19,9 @@
 
 package com.puppycrawl.tools.checkstyle.checks;
 
-import com.puppycrawl.tools.checkstyle.api.Check;
 import com.puppycrawl.tools.checkstyle.api.DetailAST;
 import com.puppycrawl.tools.checkstyle.api.TokenTypes;
 import com.puppycrawl.tools.checkstyle.api.Utils;
-import org.apache.commons.beanutils.ConversionException;
 
 /**
  * Checks the padding of parenthesis.
diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/RightCurlyCheck.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/RightCurlyCheck.java
index 81a1bce4e..4690dff7b 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/RightCurlyCheck.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/RightCurlyCheck.java
@@ -18,10 +18,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 package com.puppycrawl.tools.checkstyle.checks;
 
-import com.puppycrawl.tools.checkstyle.api.Check;
 import com.puppycrawl.tools.checkstyle.api.DetailAST;
 import com.puppycrawl.tools.checkstyle.api.TokenTypes;
-import org.apache.commons.beanutils.ConversionException;
 
 /**
  * Checks the placement of right curly braces.