diff --git a/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java b/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java
index b59bd41..1123e56 100644
--- a/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java
+++ b/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java
@@ -43,7 +43,9 @@
 import org.apache.maven.project.MavenProject;
 
 /**
- * <p>DefaultProjectDependencyAnalyzer class.</p>
+ * <p>
+ * DefaultProjectDependencyAnalyzer class.
+ * </p>
  *
  * @author <a href="mailto:markhobson@gmail.com">Mark Hobson</a>
  */
@@ -69,6 +71,7 @@ public ProjectDependencyAnalysis analyze(MavenProject project, Collection<String
         try {
             ClassesPatterns excludedClassesPatterns = new ClassesPatterns(excludedClasses);
             Map<Artifact, Set<String>> artifactClassMap = buildArtifactClassMap(project, excludedClassesPatterns);
+            Map<String, Artifact> classToArtifactMap = buildClassToArtifactMap(artifactClassMap);
 
             Set<DependencyUsage> mainDependencyClasses = new HashSet<>();
             for (MainDependencyClassesProvider provider : mainDependencyClassesProviders) {
@@ -84,14 +87,14 @@ public ProjectDependencyAnalysis analyze(MavenProject project, Collection<String
             dependencyClasses.addAll(mainDependencyClasses);
             dependencyClasses.addAll(testDependencyClasses);
 
-            Set<DependencyUsage> testOnlyDependencyClasses =
-                    buildTestOnlyDependencyClasses(mainDependencyClasses, testDependencyClasses);
+            Set<DependencyUsage> testOnlyDependencyClasses = buildTestOnlyDependencyClasses(mainDependencyClasses,
+                    testDependencyClasses);
 
-            Map<Artifact, Set<DependencyUsage>> usedArtifacts = buildUsedArtifacts(artifactClassMap, dependencyClasses);
-            Set<Artifact> mainUsedArtifacts =
-                    buildUsedArtifacts(artifactClassMap, mainDependencyClasses).keySet();
+            Map<Artifact, Set<DependencyUsage>> usedArtifacts = buildUsedArtifacts(classToArtifactMap,
+                    dependencyClasses);
+            Set<Artifact> mainUsedArtifacts = buildUsedArtifacts(classToArtifactMap, mainDependencyClasses).keySet();
 
-            Set<Artifact> testArtifacts = buildUsedArtifacts(artifactClassMap, testOnlyDependencyClasses)
+            Set<Artifact> testArtifacts = buildUsedArtifacts(classToArtifactMap, testOnlyDependencyClasses)
                     .keySet();
             Set<Artifact> testOnlyArtifacts = removeAll(testArtifacts, mainUsedArtifacts);
 
@@ -105,8 +108,8 @@ public ProjectDependencyAnalysis analyze(MavenProject project, Collection<String
             }
 
             Map<Artifact, Set<DependencyUsage>> usedUndeclaredArtifactsWithClasses = new LinkedHashMap<>(usedArtifacts);
-            Set<Artifact> usedUndeclaredArtifacts =
-                    removeAll(usedUndeclaredArtifactsWithClasses.keySet(), declaredArtifacts);
+            Set<Artifact> usedUndeclaredArtifacts = removeAll(usedUndeclaredArtifactsWithClasses.keySet(),
+                    declaredArtifacts);
 
             usedUndeclaredArtifactsWithClasses.keySet().retainAll(usedUndeclaredArtifacts);
 
@@ -124,7 +127,8 @@ public ProjectDependencyAnalysis analyze(MavenProject project, Collection<String
     }
 
     /**
-     * This method defines a new way to remove the artifacts by using the conflict id. We don't care about the version
+     * This method defines a new way to remove the artifacts by using the conflict
+     * id. We don't care about the version
      * here because there can be only 1 for a given artifact anyway.
      *
      * @param start  initial set
@@ -156,7 +160,7 @@ private static Set<Artifact> getTestArtifactsWithNonTestScope(Set<Artifact> test
         Set<Artifact> nonTestScopeArtifacts = new LinkedHashSet<>();
 
         for (Artifact artifact : testOnlyArtifacts) {
-            if (artifact.getScope().equals("compile")) {
+            if (Artifact.SCOPE_COMPILE.equals(artifact.getScope())) {
                 nonTestScopeArtifacts.add(artifact);
             }
         }
@@ -226,19 +230,14 @@ private static Set<Artifact> buildDeclaredArtifacts(MavenProject project) {
     }
 
     private static Map<Artifact, Set<DependencyUsage>> buildUsedArtifacts(
-            Map<Artifact, Set<String>> artifactClassMap, Set<DependencyUsage> dependencyClasses) {
+            Map<String, Artifact> classToArtifactMap, Set<DependencyUsage> dependencyClasses) {
         Map<Artifact, Set<DependencyUsage>> usedArtifacts = new HashMap<>();
 
         for (DependencyUsage classUsage : dependencyClasses) {
-            Artifact artifact = findArtifactForClassName(artifactClassMap, classUsage.getDependencyClass());
+            Artifact artifact = classToArtifactMap.get(classUsage.getDependencyClass());
 
             if (artifact != null && !includedInJDK(artifact)) {
-                Set<DependencyUsage> classesFromArtifact = usedArtifacts.get(artifact);
-                if (classesFromArtifact == null) {
-                    classesFromArtifact = new HashSet<>();
-                    usedArtifacts.put(artifact, classesFromArtifact);
-                }
-                classesFromArtifact.add(classUsage);
+                usedArtifacts.computeIfAbsent(artifact, k -> new HashSet<>()).add(classUsage);
             }
         }
 
@@ -260,13 +259,16 @@ private static boolean includedInJDK(Artifact artifact) {
         return false;
     }
 
-    private static Artifact findArtifactForClassName(Map<Artifact, Set<String>> artifactClassMap, String className) {
+    private static Map<String, Artifact> buildClassToArtifactMap(Map<Artifact, Set<String>> artifactClassMap) {
+        Map<String, Artifact> classToArtifactMap = new HashMap<>();
+
         for (Map.Entry<Artifact, Set<String>> entry : artifactClassMap.entrySet()) {
-            if (entry.getValue().contains(className)) {
-                return entry.getKey();
+            Artifact artifact = entry.getKey();
+            for (String className : entry.getValue()) {
+                classToArtifactMap.put(className, artifact);
             }
         }
 
-        return null;
+        return classToArtifactMap;
     }
 }