diff --git a/src/main/org/apache/tools/ant/types/FilterSet.java b/src/main/org/apache/tools/ant/types/FilterSet.java
index 002e0f04c..592725b6c 100644
--- a/src/main/org/apache/tools/ant/types/FilterSet.java
+++ b/src/main/org/apache/tools/ant/types/FilterSet.java
@@ -370,7 +370,7 @@ public class FilterSet extends DataType implements Cloneable {
               }
            } catch (Exception ex) {
               throw new BuildException("Could not read filters from file: "
-                  + filtersFile,ex);
+                  + filtersFile, ex);
            } finally {
               FileUtils.close(in);
            }
diff --git a/src/main/org/apache/tools/ant/types/PatternSet.java b/src/main/org/apache/tools/ant/types/PatternSet.java
index ec3ce26c4..dcf5d57b7 100644
--- a/src/main/org/apache/tools/ant/types/PatternSet.java
+++ b/src/main/org/apache/tools/ant/types/PatternSet.java
@@ -143,7 +143,7 @@ public class PatternSet extends DataType implements Cloneable {
         }
     }
 
-    private static class InvertedPatternSet extends PatternSet {
+    private static final class InvertedPatternSet extends PatternSet {
         private InvertedPatternSet(PatternSet p) {
             setProject(p.getProject());
             addConfiguredPatternset(p);
@@ -503,7 +503,7 @@ public class PatternSet extends DataType implements Cloneable {
 
     /**
      * Add an inverted patternset.
-     *
+     * @param p the pattern to invert and add.
      */
     public void addConfiguredInvert(PatternSet p) {
         addConfiguredPatternset(new InvertedPatternSet(p));
diff --git a/src/main/org/apache/tools/ant/types/Permissions.java b/src/main/org/apache/tools/ant/types/Permissions.java
index 79afc77be..ca25b08a5 100644
--- a/src/main/org/apache/tools/ant/types/Permissions.java
+++ b/src/main/org/apache/tools/ant/types/Permissions.java
@@ -53,7 +53,7 @@ public class Permissions {
     private boolean delegateToOldSM;
 
     // Mandatory constructor for permission object.
-    private static final Class[] PARAMS = { String.class, String.class };
+    private static final Class[] PARAMS = {String.class, String.class};
 
     /**
      * Create a set of Permissions.  Equivalent to calling
diff --git a/src/main/org/apache/tools/ant/types/ZipScanner.java b/src/main/org/apache/tools/ant/types/ZipScanner.java
index 3795a420c..9ea89bd99 100644
--- a/src/main/org/apache/tools/ant/types/ZipScanner.java
+++ b/src/main/org/apache/tools/ant/types/ZipScanner.java
@@ -27,7 +27,6 @@ import java.util.zip.ZipException;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.types.resources.FileResource;
 import org.apache.tools.ant.types.resources.ZipResource;
-import org.apache.tools.ant.util.FileUtils;
 import org.apache.tools.zip.ZipEntry;
 import org.apache.tools.zip.ZipFile;
 
diff --git a/src/main/org/apache/tools/ant/types/resources/Last.java b/src/main/org/apache/tools/ant/types/resources/Last.java
index 64b010804..475a45e36 100644
--- a/src/main/org/apache/tools/ant/types/resources/Last.java
+++ b/src/main/org/apache/tools/ant/types/resources/Last.java
@@ -42,7 +42,9 @@ public class Last extends SizeLimitCollection {
         int i = count;
         Iterator iter = rc.iterator();
         int size = rc.size();
-        for (; i < size; i++) iter.next();
+        for (; i < size; i++) {
+            iter.next();
+        }
 
         ArrayList al = new ArrayList(count);
         for (; iter.hasNext(); i++) {
diff --git a/src/main/org/apache/tools/ant/types/selectors/SelectorUtils.java b/src/main/org/apache/tools/ant/types/selectors/SelectorUtils.java
index 3a98a701d..f60cad29a 100644
--- a/src/main/org/apache/tools/ant/types/selectors/SelectorUtils.java
+++ b/src/main/org/apache/tools/ant/types/selectors/SelectorUtils.java
@@ -124,6 +124,9 @@ public final class SelectorUtils {
             strIdxStart++;
         }
 
+        // CheckStyle:SimplifyBooleanReturnCheck OFF
+        // Check turned off as the code needs the comments for the various
+        // code paths.
         if (strIdxStart > strIdxEnd) {
             // String is exhausted
             return true;
diff --git a/src/main/org/apache/tools/ant/util/ClasspathUtils.java b/src/main/org/apache/tools/ant/util/ClasspathUtils.java
index bde7798c2..38db0d51b 100644
--- a/src/main/org/apache/tools/ant/util/ClasspathUtils.java
+++ b/src/main/org/apache/tools/ant/util/ClasspathUtils.java
@@ -102,7 +102,8 @@ public class ClasspathUtils {
      * classloader behaviour)
      * @return The class loader
      */
-    public static ClassLoader getClassLoaderForPath(Project p, Reference ref, boolean reverseLoader) {
+    public static ClassLoader getClassLoaderForPath(
+        Project p, Reference ref, boolean reverseLoader) {
         String pathId = ref.getRefId();
         Object path = p.getReference(pathId);
         if (!(path instanceof Path)) {
@@ -423,8 +424,11 @@ public class ClasspathUtils {
          * @return a loader identifier.
          */
         public String getClassLoadId() {
-            return loaderId == null && classpathId != null ? MagicNames.REFID_CLASSPATH_LOADER_PREFIX
-                    + classpathId : loaderId;
+            if (loaderId == null && classpathId != null) {
+                return MagicNames.REFID_CLASSPATH_LOADER_PREFIX + classpathId;
+            } else {
+                return loaderId;
+            }
         }
 
         /**
diff --git a/src/main/org/apache/tools/ant/util/DeweyDecimal.java b/src/main/org/apache/tools/ant/util/DeweyDecimal.java
index e00f0dc44..72a394020 100644
--- a/src/main/org/apache/tools/ant/util/DeweyDecimal.java
+++ b/src/main/org/apache/tools/ant/util/DeweyDecimal.java
@@ -18,7 +18,6 @@
 package org.apache.tools.ant.util;
 
 import java.util.StringTokenizer;
-import java.util.Arrays;
 
 /**
  * Utility class to contain version numbers in "Dewey Decimal"
diff --git a/src/main/org/apache/tools/ant/util/ScriptRunnerHelper.java b/src/main/org/apache/tools/ant/util/ScriptRunnerHelper.java
index bda9833af..c60ad6bef 100644
--- a/src/main/org/apache/tools/ant/util/ScriptRunnerHelper.java
+++ b/src/main/org/apache/tools/ant/util/ScriptRunnerHelper.java
@@ -59,7 +59,7 @@ public class ScriptRunnerHelper {
         if (text != null) {
             runner.addText(text);
         }
-        if (resources !=null) {
+        if (resources != null) {
             runner.loadResources(resources);
         }
         if (setBeans) {