diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/CheckStyleTask.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/CheckStyleTask.java
index 55c68652d..1da9d2318 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/CheckStyleTask.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/CheckStyleTask.java
@@ -547,9 +547,7 @@ public class CheckStyleTask
             {
                 return createXMLLogger(aTask);
             }
-            else {
-                return createDefaultLogger(aTask);
-            }
+			return createDefaultLogger(aTask);
         }
 
         /**
@@ -580,9 +578,7 @@ public class CheckStyleTask
                 return new XMLLogger(
                     new LogOutputStream(aTask, Project.MSG_INFO), true);
             }
-            else {
-                return new XMLLogger(new FileOutputStream(mToFile), true);
-            }
+			return new XMLLogger(new FileOutputStream(mToFile), true);
         }
     }
 
diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/Checker.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/Checker.java
index e08bcd2eb..961866b60 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/Checker.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/Checker.java
@@ -376,9 +376,7 @@ public class Checker extends AutomaticBean
                     throw new IllegalArgumentException("Cannot resolve path "
                                                        + orig);
                 }
-                else {
-                    s.pop();
-                }
+                s.pop();
             }
             else { // plain component
                 s.push(thisToken);
diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/StringArrayReader.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/StringArrayReader.java
index ec4a025f5..074ff8f16 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/StringArrayReader.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/StringArrayReader.java
@@ -124,17 +124,17 @@ final class StringArrayReader extends Reader
             ensureOpen();
             return mUnderlyingArray[mArrayIdx].charAt(mStringIdx++);
         }
-        else {
-            // don't bother duplicating the new line handling above
-            // for the uncommon case
-            return super.read();
-        }
-    }
+		// don't bother duplicating the new line handling above
+		// for the uncommon case
+		return super.read();
+	}
 
     /**
-     * Throws an IOException if the reader has already been closed.
-     * @throws IOException if the stream has been closed
-     */
+	 * Throws an IOException if the reader has already been closed.
+	 * 
+	 * @throws IOException
+	 *             if the stream has been closed
+	 */
     private void ensureOpen() throws IOException
     {
         if (mClosed) {
diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/api/AutomaticBean.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/api/AutomaticBean.java
index 7efd700cf..f55107297 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/api/AutomaticBean.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/api/AutomaticBean.java
@@ -345,9 +345,7 @@ final class StrArrayConverter extends AbstractArrayConverter
             if (useDefault) {
                 return (defaultValue);
             }
-            else {
-                throw new ConversionException("No value specified");
-            }
+            throw new ConversionException("No value specified");
         }
 
         // Deal with the no-conversion-needed case
@@ -370,29 +368,30 @@ final class StrArrayConverter extends AbstractArrayConverter
             if (useDefault) {
                 return (defaultValue);
             }
-            else {
-                throw new ConversionException(aValue.toString(), e);
-            }
+            throw new ConversionException(aValue.toString(), e);
         }
     }
 
     /**
-    * <p>Parse an incoming String of the form similar to an array initializer
-    * in the Java language into a <code>List</code> individual Strings
-    * for each element, according to the following rules.</p>
-    * <ul>
-    * <li>The string must have matching '{' and '}' delimiters around
-    *     a comma-delimited list of values.</li>
-    * <li>Whitespace before and after each element is stripped.
-    * <li>If an element is itself delimited by matching single or double
-    *     quotes, the usual rules for interpreting a quoted String apply.</li>
-    * </ul>
-    *
-    * @param aValue String value to be parsed
-    * @return the list of Strings parsed from the array
-    * @throws NullPointerException if <code>svalue</code>
-    *  is <code>null</code>
-    */
+     * <p>
+     * Parse an incoming String of the form similar to an array initializer in
+     * the Java language into a <code>List</code> individual Strings for each
+     * element, according to the following rules.
+     * </p>
+     * <ul>
+     * <li>The string must have matching '{' and '}' delimiters around a
+     * comma-delimited list of values.</li>
+     * <li>Whitespace before and after each element is stripped.
+     * <li>If an element is itself delimited by matching single or double
+     * quotes, the usual rules for interpreting a quoted String apply.</li>
+     * </ul>
+     * 
+     * @param aValue
+     *            String value to be parsed
+     * @return the list of Strings parsed from the array
+     * @throws NullPointerException
+     *             if <code>svalue</code> is <code>null</code>
+     */
     protected List parseElements(String aValue)
         throws NullPointerException
     {
diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/GenericIllegalRegexpCheck.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/GenericIllegalRegexpCheck.java
index 814610b31..4b1799a41 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/GenericIllegalRegexpCheck.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/GenericIllegalRegexpCheck.java
@@ -167,20 +167,14 @@ public class GenericIllegalRegexpCheck extends AbstractFormatCheck
                     // check if the expression is on the rest of the line
                     return findNonCommentMatch(aLine, aLineNumber, endCol);
                 }
-                else {
-                    // end of line reached
-                    return false;
-                }
-            }
-            else {
-                // not intersecting with comment
-                return true;
+                // end of line reached
+                return false;
             }
+            // not intersecting with comment
+            return true;
         }
-        else {
-            // no match is found
-            return false;
-        }
+        // no match is found
+        return false;
     }
 
     /** @return the regexp to match against */
diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/duplicates/StrictDuplicateCodeCheck.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/duplicates/StrictDuplicateCodeCheck.java
index aa20f9c61..5e676102a 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/duplicates/StrictDuplicateCodeCheck.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/duplicates/StrictDuplicateCodeCheck.java
@@ -137,11 +137,8 @@ public final class StrictDuplicateCodeCheck extends AbstractFileSetCheck
             if (aLine.startsWith("import ")) {
                 return IGNORE;
             }
-            else {
-                return super.calcChecksum(aLine);
-            }
+            return super.calcChecksum(aLine);
         }
-
     }
 
     /** a jakarta commons log */
@@ -261,10 +258,8 @@ public final class StrictDuplicateCodeCheck extends AbstractFileSetCheck
         if (aFile.getName().endsWith(".java")) {
             return new JavaChecksumGenerator();
         }
-        else {
-            // TODO: Not sure what to do with binary files such as gifs
-            return new TextfileChecksumGenerator();
-        }
+        // TODO: Not sure what to do with binary files such as gifs
+        return new TextfileChecksumGenerator();
     }
 
     /**
diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/indentation/ForHandler.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/indentation/ForHandler.java
index 3c487472a..bf7191fe7 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/indentation/ForHandler.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/indentation/ForHandler.java
@@ -82,8 +82,6 @@ public class ForHandler extends BlockParentHandler
         if (aChild instanceof ElseHandler) {
             return getLevel();
         }
-        else {
-            return super.suggestedChildLevel(aChild);
-        }
+        return super.suggestedChildLevel(aChild);
     }
 }
diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/indentation/IfHandler.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/indentation/IfHandler.java
index 1d5df046e..9c79664fb 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/indentation/IfHandler.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/indentation/IfHandler.java
@@ -56,9 +56,7 @@ public class IfHandler extends BlockParentHandler
         if (aChild instanceof ElseHandler) {
             return getLevel();
         }
-        else {
-            return super.suggestedChildLevel(aChild);
-        }
+        return super.suggestedChildLevel(aChild);
     }
 
     /**
@@ -71,9 +69,7 @@ public class IfHandler extends BlockParentHandler
         if (isIfAfterElse()) {
             return getParent().getLevel();
         }
-        else {
-            return super.getLevelImpl();
-        }
+        return super.getLevelImpl();
     }
 
     /**
diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/indentation/MethodCallHandler.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/indentation/MethodCallHandler.java
index c127a7e77..834efea38 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/indentation/MethodCallHandler.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/indentation/MethodCallHandler.java
@@ -100,10 +100,7 @@ public class MethodCallHandler extends ExpressionHandler
                 if (areOnSameLine(container.getMainAst(), getMainAst())) {
                     return container.getLevel();
                 }
-                else {
-                    return new IndentLevel(container.getLevel(),
-                                           getBasicOffset());
-                }
+                return new IndentLevel(container.getLevel(), getBasicOffset());
             }
 
             // if we get here, we are the child of the left hand side (name
@@ -126,16 +123,15 @@ public class MethodCallHandler extends ExpressionHandler
         if (lineStart != firstCol) {
             return new IndentLevel(lineStart);
         }
-        else {
-            return super.getLevelImpl();
-        }
+        return super.getLevelImpl();
     }
 
     /**
      * Get the first AST of the specified method call.
-     *
-     * @param aAst   the method call
-     *
+     * 
+     * @param aAst
+     *            the method call
+     * 
      * @return the first AST of the specified method call
      */
     private DetailAST getFirstAst(DetailAST aAst)
diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/indentation/SlistHandler.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/indentation/SlistHandler.java
index 1e05d07fa..8e54338e6 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/indentation/SlistHandler.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/indentation/SlistHandler.java
@@ -70,14 +70,12 @@ public class SlistHandler extends BlockParentHandler
         {
             return getParent().suggestedChildLevel(aChild);
         }
-        else {
-            return super.suggestedChildLevel(aChild);
-        }
+        return super.suggestedChildLevel(aChild);
     }
 
     /**
      * Get the child element that is not a list of statements.
-     *
+     * 
      * @return the non-list child element
      */
     protected DetailAST getNonlistChild()
diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/indentation/TryHandler.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/indentation/TryHandler.java
index be078c7f2..99a451d7a 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/indentation/TryHandler.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/indentation/TryHandler.java
@@ -57,8 +57,6 @@ public class TryHandler extends BlockParentHandler
         {
             return getLevel();
         }
-        else {
-            return super.suggestedChildLevel(aChild);
-        }
+        return super.suggestedChildLevel(aChild);
     }
 }
diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/usage/AbstractUsageCheck.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/usage/AbstractUsageCheck.java
index 394cf8935..4e7afb721 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/usage/AbstractUsageCheck.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/usage/AbstractUsageCheck.java
@@ -146,9 +146,8 @@ public abstract class AbstractUsageCheck
         if (definition != null) {
             return definition.getNumReferences();
         }
-        else {
-            return 0;
-        }
+
+        return 0;
     }
 
     /**
diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/usage/OneMethodPrivateFieldCheck.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/usage/OneMethodPrivateFieldCheck.java
index df369001a..89a912cc0 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/usage/OneMethodPrivateFieldCheck.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/usage/OneMethodPrivateFieldCheck.java
@@ -134,9 +134,7 @@ public class OneMethodPrivateFieldCheck
         if (definition != null) {
             return definition.getReferences();
         }
-        else {
-            final Set dummy = new HashSet();
-            return dummy.iterator();
-        }
+        final Set dummy = new HashSet();
+        return dummy.iterator();
     }
 }
diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/usage/transmogrify/UnknownClass.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/usage/transmogrify/UnknownClass.java
index 96899de99..6f59fc12b 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/usage/transmogrify/UnknownClass.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/usage/transmogrify/UnknownClass.java
@@ -165,9 +165,7 @@ public class UnknownClass implements IClass {
         final UnknownClass other = (UnknownClass) o;
         return other.getName().equals(getName());
     }
-    else {
-        return false;
-    }
+    return false;
   }
 
   public String toString() {
diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/doclets/TokenTypesDoclet.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/doclets/TokenTypesDoclet.java
index 2d7185147..63c4254b7 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/doclets/TokenTypesDoclet.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/doclets/TokenTypesDoclet.java
@@ -106,9 +106,7 @@ public class TokenTypesDoclet
                     aReporter.printError("Only one -destfile option allowed.");
                     return false;
                 }
-                else {
-                    foundDestFileOption = true;
-                }
+                foundDestFileOption = true;
             }
         }
         if (!foundDestFileOption) {
diff --git a/src/tests/com/puppycrawl/tools/checkstyle/PackageNamesLoaderTest.java b/src/tests/com/puppycrawl/tools/checkstyle/PackageNamesLoaderTest.java
index f0be5e7f2..833e11648 100644
--- a/src/tests/com/puppycrawl/tools/checkstyle/PackageNamesLoaderTest.java
+++ b/src/tests/com/puppycrawl/tools/checkstyle/PackageNamesLoaderTest.java
@@ -25,7 +25,6 @@ public class PackageNamesLoaderTest extends TestCase
     }
     
     public void testNoFile()
-        throws CheckstyleException
     {
         try {
             PackageNamesLoader.loadModuleFactory("NoFile");