diff --git a/processor/src/main/java/org/mapstruct/ap/model/PropertyMapping.java b/processor/src/main/java/org/mapstruct/ap/model/PropertyMapping.java
index 780348a23..dd433a6a0 100644
--- a/processor/src/main/java/org/mapstruct/ap/model/PropertyMapping.java
+++ b/processor/src/main/java/org/mapstruct/ap/model/PropertyMapping.java
@@ -56,7 +56,7 @@ public class PropertyMapping extends AbstractModelElement {
         this.targetName = targetName;
         this.targetAccessorName = targetAccessorName;
         this.targetType = targetType;
-        this.isHasTargetSetter =  targetAccessorName.startsWith( "set" );
+        this.isHasTargetSetter = targetAccessorName.startsWith( "set" );
 
         this.mappingMethod = mappingMethod;
         this.conversion = conversion;
diff --git a/processor/src/main/java/org/mapstruct/ap/processor/MapperCreationProcessor.java b/processor/src/main/java/org/mapstruct/ap/processor/MapperCreationProcessor.java
index 3de17ee9e..991b3ac34 100644
--- a/processor/src/main/java/org/mapstruct/ap/processor/MapperCreationProcessor.java
+++ b/processor/src/main/java/org/mapstruct/ap/processor/MapperCreationProcessor.java
@@ -287,8 +287,10 @@ public class MapperCreationProcessor implements ModelElementProcessor<List<Metho
         List<ExecutableElement> targetAccessors = filters.setterMethodsIn(
             elementUtils.getAllMembers( resultTypeElement )
         );
-        targetAccessors.addAll( filters.alternativeTargetAccessorMethodsIn(
-            elementUtils.getAllMembers( resultTypeElement ) )
+        targetAccessors.addAll(
+            filters.alternativeTargetAccessorMethodsIn(
+                elementUtils.getAllMembers( resultTypeElement )
+            )
         );
 
         for ( ExecutableElement targetAccessor : targetAccessors ) {
@@ -386,8 +388,10 @@ public class MapperCreationProcessor implements ModelElementProcessor<List<Metho
         List<ExecutableElement> targetAccessors = filters.setterMethodsIn(
             elementUtils.getAllMembers( parameterTypeElement )
         );
-        targetAccessors.addAll( filters.alternativeTargetAccessorMethodsIn(
-            elementUtils.getAllMembers( parameterTypeElement ) )
+        targetAccessors.addAll(
+            filters.alternativeTargetAccessorMethodsIn(
+                elementUtils.getAllMembers( parameterTypeElement )
+            )
         );
         return executables.getPropertyNames( targetAccessors ).contains( propertyName );
     }
@@ -397,8 +401,10 @@ public class MapperCreationProcessor implements ModelElementProcessor<List<Metho
         List<ExecutableElement> targetAccessors = filters.setterMethodsIn(
             elementUtils.getAllMembers( resultTypeElement )
         );
-        targetAccessors.addAll( filters.alternativeTargetAccessorMethodsIn(
-            elementUtils.getAllMembers( resultTypeElement ) )
+        targetAccessors.addAll(
+            filters.alternativeTargetAccessorMethodsIn(
+                elementUtils.getAllMembers( resultTypeElement )
+            )
         );
         Set<String> targetProperties = executables.getPropertyNames( targetAccessors );
 
@@ -481,7 +487,7 @@ public class MapperCreationProcessor implements ModelElementProcessor<List<Metho
         Type sourceType = executables.retrieveReturnType( getterMethod );
         Type targetType = null;
         String conversionStr = null;
-        if (executables.isSetterMethod( setterMethod ) ) {
+        if ( executables.isSetterMethod( setterMethod ) ) {
             targetType = executables.retrieveSingleParameter( setterMethod ).getType();
             conversionStr = parameter.getName() + "." + getterMethod.getSimpleName().toString() + "()";
         }
diff --git a/processor/src/main/java/org/mapstruct/ap/util/Filters.java b/processor/src/main/java/org/mapstruct/ap/util/Filters.java
index b8f271e19..cb3776254 100644
--- a/processor/src/main/java/org/mapstruct/ap/util/Filters.java
+++ b/processor/src/main/java/org/mapstruct/ap/util/Filters.java
@@ -68,6 +68,7 @@ public class Filters {
      * Provided such a getter is initialized lazy by the target class, e.g. in generated JAXB beans.
      *
      * @param elements
+     *
      * @return
      */
     public List<ExecutableElement> alternativeTargetAccessorMethodsIn(Iterable<? extends Element> elements) {
@@ -75,10 +76,10 @@ public class Filters {
         List<ExecutableElement> getterMethods = getterMethodsIn( elements );
         List<ExecutableElement> alternativeTargetAccessorsMethods = new LinkedList<ExecutableElement>();
 
-        if (getterMethods.size() > setterMethods.size()) {
+        if ( getterMethods.size() > setterMethods.size() ) {
             // there could be a getter method for a list that is not present as setter.
-            // a getter could substitue the setter in that case and act as setter.
-            // (asuming its intitialized)
+            // a getter could substitute the setter in that case and act as setter.
+            // (assuming it is initialized)
             for ( ExecutableElement getterMethod : getterMethods ) {
                 boolean matchFound = false;
                 String getterPropertyName = executables.getPropertyName( getterMethod );
diff --git a/processor/src/main/java/org/mapstruct/ap/util/TypeFactory.java b/processor/src/main/java/org/mapstruct/ap/util/TypeFactory.java
index 590f9c620..728c0ad76 100644
--- a/processor/src/main/java/org/mapstruct/ap/util/TypeFactory.java
+++ b/processor/src/main/java/org/mapstruct/ap/util/TypeFactory.java
@@ -57,7 +57,6 @@ public class TypeFactory {
 
     private final TypeMirror iterableType;
     private final TypeMirror collectionType;
-    private final TypeMirror listType;
     private final TypeMirror mapType;
 
     private final Map<String, Type> implementationTypes = new HashMap<String, Type>();
@@ -71,7 +70,6 @@ public class TypeFactory {
             elementUtils.getTypeElement( Collection.class.getCanonicalName() )
                 .asType()
         );
-        listType = typeUtils.erasure( elementUtils.getTypeElement( List.class.getCanonicalName() ).asType() );
         mapType = typeUtils.erasure( elementUtils.getTypeElement( Map.class.getCanonicalName() ).asType() );
 
         implementationTypes.put( Iterable.class.getName(), getType( ArrayList.class ) );
diff --git a/processor/src/test/java/org/mapstruct/ap/test/collection/Source.java b/processor/src/test/java/org/mapstruct/ap/test/collection/Source.java
index 8146b5dd7..78676394c 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/collection/Source.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/collection/Source.java
@@ -131,7 +131,7 @@ public class Source {
         return stringList2;
     }
 
-    public void setStringList2( List<String> stringList2 ) {
+    public void setStringList2(List<String> stringList2) {
         this.stringList2 = stringList2;
     }
 
diff --git a/processor/src/test/java/org/mapstruct/ap/test/collection/defaultimplementation/DefaultCollectionImplementationTest.java b/processor/src/test/java/org/mapstruct/ap/test/collection/defaultimplementation/DefaultCollectionImplementationTest.java
index 3c0f3170d..efd32ca57 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/collection/defaultimplementation/DefaultCollectionImplementationTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/collection/defaultimplementation/DefaultCollectionImplementationTest.java
@@ -18,9 +18,6 @@
  */
 package org.mapstruct.ap.test.collection.defaultimplementation;
 
-import static org.fest.assertions.Assertions.assertThat;
-import static org.fest.assertions.MapAssert.entry;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -41,6 +38,9 @@ import org.mapstruct.ap.testutil.MapperTestBase;
 import org.mapstruct.ap.testutil.WithClasses;
 import org.testng.annotations.Test;
 
+import static org.fest.assertions.Assertions.assertThat;
+import static org.fest.assertions.MapAssert.entry;
+
 @WithClasses({
     Source.class,
     Target.class,
@@ -51,7 +51,7 @@ import org.testng.annotations.Test;
 public class DefaultCollectionImplementationTest extends MapperTestBase {
 
     @Test
-    @IssueKey( "6" )
+    @IssueKey("6")
     public void shouldUseDefaultImplementationForConcurrentMap() {
         ConcurrentMap<String, TargetFoo> target =
             SourceTargetMapper.INSTANCE.sourceFooMapToTargetFooConcurrentMap( createSourceFooMap() );
@@ -60,7 +60,7 @@ public class DefaultCollectionImplementationTest extends MapperTestBase {
     }
 
     @Test
-    @IssueKey( "6" )
+    @IssueKey("6")
     public void shouldUseDefaultImplementationForConcurrentNavigableMap() {
         ConcurrentNavigableMap<String, TargetFoo> target =
             SourceTargetMapper.INSTANCE.sourceFooMapToTargetFooConcurrentNavigableMap( createSourceFooMap() );
@@ -69,7 +69,7 @@ public class DefaultCollectionImplementationTest extends MapperTestBase {
     }
 
     @Test
-    @IssueKey( "6" )
+    @IssueKey("6")
     public void shouldUseDefaultImplementationForMap() {
         Map<String, TargetFoo> target = SourceTargetMapper.INSTANCE.sourceFooMapToTargetFooMap( createSourceFooMap() );
 
@@ -77,7 +77,7 @@ public class DefaultCollectionImplementationTest extends MapperTestBase {
     }
 
     @Test
-    @IssueKey( "6" )
+    @IssueKey("6")
     public void shouldUseDefaultImplementationForNavigableMap() {
         NavigableMap<String, TargetFoo> target =
             SourceTargetMapper.INSTANCE.sourceFooMapToTargetFooNavigableMap( createSourceFooMap() );
@@ -86,7 +86,7 @@ public class DefaultCollectionImplementationTest extends MapperTestBase {
     }
 
     @Test
-    @IssueKey( "6" )
+    @IssueKey("6")
     public void shouldUseDefaultImplementationForSortedMap() {
         SortedMap<String, TargetFoo> target =
             SourceTargetMapper.INSTANCE.sourceFooMapToTargetFooSortedMap( createSourceFooMap() );
@@ -95,7 +95,7 @@ public class DefaultCollectionImplementationTest extends MapperTestBase {
     }
 
     @Test
-    @IssueKey( "6" )
+    @IssueKey("6")
     public void shouldUseDefaultImplementationForNaviableSet() {
         NavigableSet<TargetFoo> target =
             SourceTargetMapper.INSTANCE.sourceFoosToTargetFooNavigableSet( createSourceFooList() );
@@ -139,7 +139,7 @@ public class DefaultCollectionImplementationTest extends MapperTestBase {
     }
 
     @Test
-    @IssueKey( "6" )
+    @IssueKey("6")
     public void shouldUseDefaultImplementationForSortedSet() {
         SortedSet<TargetFoo> target =
             SourceTargetMapper.INSTANCE.sourceFoosToTargetFooSortedSet( createSourceFooList() );
@@ -153,7 +153,8 @@ public class DefaultCollectionImplementationTest extends MapperTestBase {
         List<TargetFoo> target = new ArrayList<TargetFoo>();
         SourceTargetMapper.INSTANCE.sourceFoosToTargetFoosUsingTargetParameter(
             target,
-            createSourceFooList() );
+            createSourceFooList()
+        );
 
         assertResultList( target );
     }
@@ -178,7 +179,7 @@ public class DefaultCollectionImplementationTest extends MapperTestBase {
         Target target = SourceTargetMapper.INSTANCE.sourceToTarget( source );
 
         assertThat( target ).isNotNull();
-        assertThat( target.getFooListNoSetter()).containsExactly( new TargetFoo( "Bob" ), new TargetFoo( "Alice" ) );
+        assertThat( target.getFooListNoSetter() ).containsExactly( new TargetFoo( "Bob" ), new TargetFoo( "Alice" ) );
     }
 
     private void assertResultList(Iterable<TargetFoo> fooIterable) {
diff --git a/processor/src/test/java/org/mapstruct/ap/test/collection/defaultimplementation/Source.java b/processor/src/test/java/org/mapstruct/ap/test/collection/defaultimplementation/Source.java
index 1336d7ccc..da255fc05 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/collection/defaultimplementation/Source.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/collection/defaultimplementation/Source.java
@@ -28,7 +28,7 @@ public class Source {
         return fooList;
     }
 
-    public void setFooList( List<SourceFoo> fooList ) {
+    public void setFooList(List<SourceFoo> fooList) {
         this.fooList = fooList;
     }