diff --git a/src/main/java/org/apache/maven/shared/dependency/graph/internal/ArtifactKey.java b/src/main/java/org/apache/maven/shared/dependency/graph/internal/ArtifactKey.java
index f2aa10f..56f3e3c 100644
--- a/src/main/java/org/apache/maven/shared/dependency/graph/internal/ArtifactKey.java
+++ b/src/main/java/org/apache/maven/shared/dependency/graph/internal/ArtifactKey.java
@@ -41,7 +41,7 @@
 
     public ArtifactKey( MavenProject project )
     {
-        this ( project.getGroupId(), project.getArtifactId(), project.getVersion() );
+        this( project.getGroupId(), project.getArtifactId(), project.getVersion() );
     }
 
     @Override
@@ -51,27 +51,15 @@
         {
             return true;
         }
+
         if ( !( o instanceof ArtifactKey ) )
         {
             return false;
         }
 
-        ArtifactKey that = ( ArtifactKey ) o;
+        ArtifactKey that = (ArtifactKey) o;
 
-        if ( !artifactId.equals( that.artifactId ) )
-        {
-            return false;
-        }
-        if ( !groupId.equals( that.groupId ) )
-        {
-            return false;
-        }
-        if ( !version.equals( that.version ) )
-        {
-            return false;
-        }
-
-        return true;
+        return artifactId.equals( that.artifactId ) && groupId.equals( that.groupId ) && version.equals( that.version );
     }
 
     @Override
