diff --git a/src/main/java/org/owasp/dependencycheck/analyzer/FalsePositiveAnalyzer.java b/src/main/java/org/owasp/dependencycheck/analyzer/FalsePositiveAnalyzer.java
index c81acb9ce..a39629ed9 100644
--- a/src/main/java/org/owasp/dependencycheck/analyzer/FalsePositiveAnalyzer.java
+++ b/src/main/java/org/owasp/dependencycheck/analyzer/FalsePositiveAnalyzer.java
@@ -119,6 +119,10 @@ public class FalsePositiveAnalyzer extends AbstractAnalyzer {
         removeVersions(dependency);
     }
 
+    /**
+     * Intended to remove spurious CPE entries.
+     * @param dependency the dependency being analyzed
+     */
     private void removeVersions(Dependency dependency) {
         //todo implement this so that the following is corrected?
         //cpe: cpe:/a:apache:axis2:1.4
@@ -139,10 +143,10 @@ public class FalsePositiveAnalyzer extends AbstractAnalyzer {
      * @param dependency the dependency to remove JRE CPEs from
      */
     private void removeJreEntries(Dependency dependency) {
-        List<Identifier> identifiers = dependency.getIdentifiers();
-        Iterator<Identifier> itr = identifiers.iterator();
+        final List<Identifier> identifiers = dependency.getIdentifiers();
+        final Iterator<Identifier> itr = identifiers.iterator();
         while (itr.hasNext()) {
-            Identifier i = itr.next();
+            final Identifier i = itr.next();
             if ((i.getValue().startsWith("cpe:/a:sun:java:")
                     || i.getValue().startsWith("cpe:/a:oracle:jre")
                     || i.getValue().startsWith("cpe:/a:oracle:jdk"))
diff --git a/src/main/java/org/owasp/dependencycheck/analyzer/JarAnalyzer.java b/src/main/java/org/owasp/dependencycheck/analyzer/JarAnalyzer.java
index 5e0231c42..812f11a18 100644
--- a/src/main/java/org/owasp/dependencycheck/analyzer/JarAnalyzer.java
+++ b/src/main/java/org/owasp/dependencycheck/analyzer/JarAnalyzer.java
@@ -202,8 +202,6 @@ public class JarAnalyzer extends AbstractAnalyzer implements Analyzer {
      *
      * @param dependency the dependency being analyzed.
      * @throws IOException is thrown if there is an error reading the zip file.
-     * @throws JAXBException is thrown if there is an error extracting the model
-     * (aka pom).
      * @throws AnalysisException is thrown if there is an exception parsing the
      * pom.
      * @return whether or not evidence was added to the dependency
@@ -211,7 +209,7 @@ public class JarAnalyzer extends AbstractAnalyzer implements Analyzer {
     protected boolean analyzePOM(Dependency dependency) throws IOException, AnalysisException {
         boolean foundSomething = false;
         Properties pomProperties = null;
-        List<Model> poms = new ArrayList<Model>();
+        final List<Model> poms = new ArrayList<Model>();
         FileInputStream fs = null;
         try {
             fs = new FileInputStream(dependency.getActualFilePath());
@@ -228,9 +226,9 @@ public class JarAnalyzer extends AbstractAnalyzer implements Analyzer {
                         final JAXBElement obj = (JAXBElement) pomUnmarshaller.unmarshal(stream);
                         p = (Model) obj.getValue();
                     } catch (JAXBException ex) {
-                        String msg = String.format("Unable to parse POM '%s' in '%s'",
+                        final String msg = String.format("Unable to parse POM '%s' in '%s'",
                                 entry.getName(), dependency.getFilePath());
-                        AnalysisException ax = new AnalysisException(msg, ex);
+                        final AnalysisException ax = new AnalysisException(msg, ex);
                         dependency.getAnalysisExceptions().add(ax);
                         Logger.getLogger(JarAnalyzer.class.getName()).log(Level.INFO, msg);
                     }
@@ -254,8 +252,8 @@ public class JarAnalyzer extends AbstractAnalyzer implements Analyzer {
                             zin.closeEntry();
                         }
                     } else {
-                        String msg = "JAR file contains multiple pom.properties files - unable to process POM";
-                        AnalysisException ax = new AnalysisException(msg);
+                        final String msg = "JAR file contains multiple pom.properties files - unable to process POM";
+                        final AnalysisException ax = new AnalysisException(msg);
                         dependency.getAnalysisExceptions().add(ax);
                         Logger.getLogger(JarAnalyzer.class.getName()).log(Level.INFO, msg);
                     }
@@ -717,6 +715,7 @@ public class JarAnalyzer extends AbstractAnalyzer implements Analyzer {
     /**
      * Determines if the key value pair from the manifest is for an "import" type
      * entry for package names.
+     * 
      * @param key the key from the manifest
      * @param value the value from the manifest
      * @return true or false depending on if it is believed the entry is an "import" entry
@@ -724,11 +723,7 @@ public class JarAnalyzer extends AbstractAnalyzer implements Analyzer {
     private boolean isImportPackage(String key, String value) {
         final Pattern packageRx = Pattern.compile("^((([a-zA-Z_#\\$0-9]\\.)+)\\s*\\;\\s*)+$");
         if (packageRx.matcher(value).matches()) {
-            if (key.contains("import") || key.contains("include")) {
-                return true;
-            } else {
-                return false;
-            }
+            return (key.contains("import") || key.contains("include"));
         }
         return false;
     }