diff --git a/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/extractor/AbstractScriptedMojoDescriptorExtractor.java b/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/extractor/AbstractScriptedMojoDescriptorExtractor.java
index 00717ab..86c97fd 100644
--- a/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/extractor/AbstractScriptedMojoDescriptorExtractor.java
+++ b/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/extractor/AbstractScriptedMojoDescriptorExtractor.java
@@ -171,9 +171,8 @@ public abstract class AbstractScriptedMojoDescriptorExtractor
 
                 String[] relativePaths = scanner.getIncludedFiles();
 
-                for ( int i = 0; i < relativePaths.length; i++ )
+                for ( String relativePath : relativePaths )
                 {
-                    String relativePath = relativePaths[i];
                     File scriptFile = new File( dir, relativePath ).getAbsoluteFile();
 
                     if ( scriptFile.isFile() && relativePath.endsWith( scriptFileExtension ) )
diff --git a/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGenerator.java b/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGenerator.java
index 3ea06d6..d41f341 100644
--- a/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGenerator.java
+++ b/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGenerator.java
@@ -316,7 +316,7 @@ public class PluginDescriptorGenerator
                                      extendedMojoDescriptor.getDependencyCollectionRequired() );
             }
 
-            PluginUtils.element( w, "threadSafe", "" + extendedMojoDescriptor.isThreadSafe() );
+            PluginUtils.element( w, "threadSafe", String.valueOf( extendedMojoDescriptor.isThreadSafe() ) );
         }
 
         // ----------------------------------------------------------------------
diff --git a/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/scanner/DefaultMojoScanner.java b/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/scanner/DefaultMojoScanner.java
index 826ef90..1d5d8a2 100644
--- a/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/scanner/DefaultMojoScanner.java
+++ b/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/scanner/DefaultMojoScanner.java
@@ -91,7 +91,7 @@ public class DefaultMojoScanner
 
         for ( String language : activeExtractorsInternal )
         {
-            MojoDescriptorExtractor extractor = (MojoDescriptorExtractor) mojoDescriptorExtractors.get( language );
+            MojoDescriptorExtractor extractor = mojoDescriptorExtractors.get( language );
 
             if ( extractor == null )
             {
diff --git a/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/scanner/MojoScanner.java b/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/scanner/MojoScanner.java
index c382e33..f923be4 100644
--- a/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/scanner/MojoScanner.java
+++ b/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/scanner/MojoScanner.java
@@ -62,7 +62,7 @@ public interface MojoScanner
      * <p/>
      * Only the specified extractors will be used, all others will be skipped.
      *
-     * @param extractors The names of the sctive extractors. If this parameter is <code>null</code>,
+     * @param extractors The names of the active extractors. If this parameter is <code>null</code>,
      * all the scanner's extractors are considered active. Set entries that are <code>null</code> or
      * empty ("") will be ignored.
      */
diff --git a/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/util/PluginUtils.java b/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/util/PluginUtils.java
index 281e4f7..ac2d974 100644
--- a/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/util/PluginUtils.java
+++ b/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/util/PluginUtils.java
@@ -31,7 +31,6 @@ import java.net.URLClassLoader;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
-import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Stack;
@@ -113,11 +112,10 @@ public final class PluginUtils
     {
         w.startElement( "dependencies" );
 
-        for ( @SuppressWarnings( "unchecked" )
-        Iterator<ComponentDependency> it = pluginDescriptor.getDependencies().iterator(); it.hasNext(); )
+        @SuppressWarnings( "unchecked" )
+        List<ComponentDependency> deps = pluginDescriptor.getDependencies();
+        for ( ComponentDependency dep : deps )
         {
-            ComponentDependency dep = it.next();
-
             w.startElement( "dependency" );
 
             PluginUtils.element( w, "groupId", dep.getGroupId() );
@@ -205,42 +203,35 @@ public final class PluginUtils
             }
             catch ( DependencyResolutionRequiredException e )
             {
-                throw (RuntimeException) new IllegalArgumentException().initCause( e );
+                throw new IllegalArgumentException( e );
             }
 
             List<URL> urls = new ArrayList<URL>( classPathStrings.size() );
-            for ( Iterator<String> it = classPathStrings.iterator(); it.hasNext(); )
+            for ( String classPathString : classPathStrings )
             {
                 try
                 {
-                    urls.add( new File( ( (String) it.next() ) ).toURL() );
+                    urls.add( new File( classPathString ).toURL() );
                 }
                 catch ( MalformedURLException e )
                 {
-                    throw (RuntimeException) new IllegalArgumentException().initCause( e );
+                    throw new IllegalArgumentException( e );
                 }
             }
 
-            classLoader = new URLClassLoader( (URL[]) urls.toArray( new URL[urls.size()] ),
-                                                                    classLoader );
+            classLoader = new URLClassLoader( urls.toArray( new URL[urls.size()] ), classLoader );
         }
 
-        Class<?> clazz = null;
         try
         {
-            clazz = Class.forName( impl, false, classLoader );
+            Class<?> clazz = Class.forName( impl, false, classLoader );
+
+            return MavenReport.class.isAssignableFrom( clazz );
         }
         catch ( ClassNotFoundException e )
         {
             return false;
         }
-
-        if ( MavenReport.class.isAssignableFrom( clazz ) )
-        {
-            return true;
-        }
-
-        return false;
     }
 
     /**
@@ -447,11 +438,8 @@ public final class PluginUtils
             Collections.sort( parameters, new Comparator<Parameter>()
             {
                 /** {@inheritDoc} */
-                public int compare( Parameter arg0, Parameter arg1 )
+                public int compare( Parameter parameter1, Parameter parameter2 )
                 {
-                    Parameter parameter1 = (Parameter) arg0;
-                    Parameter parameter2 = (Parameter) arg1;
-
                     return parameter1.getName().compareToIgnoreCase( parameter2.getName() );
                 }
             } );
@@ -587,7 +575,7 @@ public final class PluginUtils
             }
             else if ( HTML.Tag.LI.equals( t ) )
             {
-                Counter counter = (Counter) numbering.peek();
+                Counter counter = numbering.peek();
                 if ( counter == null )
                 {
                     text( "-\t" );