diff --git a/.gitignore b/.gitignore
index 8f790488d..4c4517e93 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@
 .settings
 .factorypath
 .checkstyle
+.externalToolBuilders
 
 # IntelliJ
 *.iml
diff --git a/processor/src/main/java/org/mapstruct/ap/conversion/ReverseConversion.java b/processor/src/main/java/org/mapstruct/ap/conversion/ReverseConversion.java
index 28db49745..99bd24fd8 100644
--- a/processor/src/main/java/org/mapstruct/ap/conversion/ReverseConversion.java
+++ b/processor/src/main/java/org/mapstruct/ap/conversion/ReverseConversion.java
@@ -40,7 +40,7 @@ public class ReverseConversion implements ConversionProvider {
     }
 
     @Override
-    public Assignment to( ConversionContext conversionContext) {
+    public Assignment to(ConversionContext conversionContext) {
         return conversionProvider.from( conversionContext );
     }
 
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 69a53c117..3f5d8d652 100644
--- a/processor/src/main/java/org/mapstruct/ap/processor/MapperCreationProcessor.java
+++ b/processor/src/main/java/org/mapstruct/ap/processor/MapperCreationProcessor.java
@@ -18,7 +18,6 @@
  */
 package org.mapstruct.ap.processor;
 
-import org.mapstruct.ap.processor.creation.MappingResolver;
 import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -27,6 +26,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+
 import javax.annotation.processing.Messager;
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.TypeElement;
@@ -36,8 +36,8 @@ import javax.lang.model.util.ElementFilter;
 import javax.lang.model.util.Elements;
 import javax.lang.model.util.Types;
 import javax.tools.Diagnostic.Kind;
-import org.mapstruct.ap.model.Assignment;
 
+import org.mapstruct.ap.model.Assignment;
 import org.mapstruct.ap.model.BeanMappingMethod;
 import org.mapstruct.ap.model.Decorator;
 import org.mapstruct.ap.model.DefaultMapperReference;
@@ -51,8 +51,8 @@ import org.mapstruct.ap.model.MapperReference;
 import org.mapstruct.ap.model.MappingMethod;
 import org.mapstruct.ap.model.PropertyMapping;
 import org.mapstruct.ap.model.assignment.AssignmentFactory;
-import org.mapstruct.ap.model.assignment.NewCollectionOrMapWrapper;
 import org.mapstruct.ap.model.assignment.LocalVarWrapper;
+import org.mapstruct.ap.model.assignment.NewCollectionOrMapWrapper;
 import org.mapstruct.ap.model.assignment.NullCheckWrapper;
 import org.mapstruct.ap.model.assignment.SetterWrapper;
 import org.mapstruct.ap.model.common.Parameter;
@@ -66,6 +66,7 @@ import org.mapstruct.ap.option.Options;
 import org.mapstruct.ap.option.ReportingPolicy;
 import org.mapstruct.ap.prism.DecoratedWithPrism;
 import org.mapstruct.ap.prism.MapperPrism;
+import org.mapstruct.ap.processor.creation.MappingResolver;
 import org.mapstruct.ap.util.Executables;
 import org.mapstruct.ap.util.MapperConfig;
 import org.mapstruct.ap.util.Strings;
@@ -88,7 +89,6 @@ public class MapperCreationProcessor implements ModelElementProcessor<List<Sourc
     private MappingResolver mappingResolver;
 
 
-
     @Override
     public Mapper process(ProcessorContext context, TypeElement mapperTypeElement, List<SourceMethod> sourceModel) {
         this.elementUtils = context.getElementUtils();
@@ -98,7 +98,7 @@ public class MapperCreationProcessor implements ModelElementProcessor<List<Sourc
 
         this.typeFactory = context.getTypeFactory();
 
-        this.mappingResolver = new MappingResolver(messager, typeFactory, elementUtils, typeUtils );
+        this.mappingResolver = new MappingResolver( messager, typeFactory, elementUtils, typeUtils );
 
 
         return getMapper( mapperTypeElement, sourceModel );
@@ -322,7 +322,7 @@ public class MapperCreationProcessor implements ModelElementProcessor<List<Sourc
     }
 
     private FactoryMethod getFactoryMethod(List<MapperReference> mapperReferences, List<SourceMethod> methods,
-                                             Type returnType) {
+                                           Type returnType) {
         FactoryMethod result = null;
         for ( SourceMethod method : methods ) {
             if ( !method.requiresImplementation() && !method.isIterableMapping() && !method.isMapMapping()
@@ -669,10 +669,10 @@ public class MapperCreationProcessor implements ModelElementProcessor<List<Sourc
                 }
             }
 
-            // target accessor is setter, so decorate assigmment as setter
+            // target accessor is setter, so decorate assignment as setter
             assignment = new SetterWrapper( assignment, method.getThrownTypes() );
 
-            // decorate assigment with null check of source can be null (is not primitive)
+            // decorate assignment with null check of source can be null (is not primitive)
             if ( !sourceType.isPrimitive() ) {
                 assignment = new NullCheckWrapper( assignment );
             }
@@ -680,26 +680,26 @@ public class MapperCreationProcessor implements ModelElementProcessor<List<Sourc
         }
         else {
             messager.printMessage(
-                    Kind.ERROR,
-                    String.format(
-                            "Can't map property \"%s %s\" to \"%s %s\".",
-                            sourceType,
-                            Executables.getPropertyName( sourceAccessor ),
-                            targetType,
-                            Executables.getPropertyName( targetAcessor )
-                    ),
-                    method.getExecutable()
+                Kind.ERROR,
+                String.format(
+                    "Can't map property \"%s %s\" to \"%s %s\".",
+                    sourceType,
+                    Executables.getPropertyName( sourceAccessor ),
+                    targetType,
+                    Executables.getPropertyName( targetAcessor )
+                ),
+                method.getExecutable()
             );
         }
         return new PropertyMapping(
-                parameter.getName(),
-                Executables.getPropertyName( sourceAccessor ),
-                sourceAccessor.getSimpleName().toString(),
-                sourceType,
-                Executables.getPropertyName( targetAcessor ),
-                targetAcessor.getSimpleName().toString(),
-                targetType,
-                assignment
+            parameter.getName(),
+            Executables.getPropertyName( sourceAccessor ),
+            sourceAccessor.getSimpleName().toString(),
+            sourceType,
+            Executables.getPropertyName( targetAcessor ),
+            targetAcessor.getSimpleName().toString(),
+            targetType,
+            assignment
         );
     }
 
@@ -735,7 +735,7 @@ public class MapperCreationProcessor implements ModelElementProcessor<List<Sourc
             );
         }
 
-        // target accessor is setter, so decorate assigmment as setter
+        // target accessor is setter, so decorate assignment as setter
         assignment = new SetterWrapper( assignment, method.getThrownTypes() );
 
         FactoryMethod factoryMethod = getFactoryMethod( mapperReferences, methods, method.getReturnType() );
@@ -810,7 +810,7 @@ public class MapperCreationProcessor implements ModelElementProcessor<List<Sourc
         keyAssignment = new LocalVarWrapper( keyAssignment, method.getThrownTypes() );
         valueAssignment = new LocalVarWrapper( valueAssignment, method.getThrownTypes() );
 
-        return new MapMappingMethod( method, keyAssignment,  valueAssignment, factoryMethod );
+        return new MapMappingMethod( method, keyAssignment, valueAssignment, factoryMethod );
     }
 
     private EnumMappingMethod getEnumMappingMethod(SourceMethod method) {
diff --git a/processor/src/main/java/org/mapstruct/ap/processor/creation/MappingResolver.java b/processor/src/main/java/org/mapstruct/ap/processor/creation/MappingResolver.java
index 0b2534bcd..6f3bd8f97 100644
--- a/processor/src/main/java/org/mapstruct/ap/processor/creation/MappingResolver.java
+++ b/processor/src/main/java/org/mapstruct/ap/processor/creation/MappingResolver.java
@@ -22,6 +22,7 @@ import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+
 import javax.annotation.processing.Messager;
 import javax.lang.model.type.TypeMirror;
 import javax.lang.model.util.Elements;
@@ -32,9 +33,9 @@ import org.mapstruct.ap.conversion.ConversionProvider;
 import org.mapstruct.ap.conversion.Conversions;
 import org.mapstruct.ap.model.Assignment;
 import org.mapstruct.ap.model.MapperReference;
-import org.mapstruct.ap.model.assignment.Simple;
 import org.mapstruct.ap.model.VirtualMappingMethod;
 import org.mapstruct.ap.model.assignment.AssignmentFactory;
+import org.mapstruct.ap.model.assignment.Simple;
 import org.mapstruct.ap.model.common.ConversionContext;
 import org.mapstruct.ap.model.common.DefaultConversionContext;
 import org.mapstruct.ap.model.common.Type;
@@ -189,7 +190,7 @@ public class MappingResolver {
 
             // then direct assignable
             if ( sourceType.isAssignableTo( targetType ) || context.isPropertyMappable( sourceType, targetType ) ) {
-                Simple simpleAssignment = AssignmentFactory.createSimple( sourceReference );
+                Assignment simpleAssignment = AssignmentFactory.createSimple( sourceReference );
                 return simpleAssignment;
             }
 
@@ -226,7 +227,6 @@ public class MappingResolver {
         }
 
         private Assignment resolveViaConversion( Type sourceType, Type targetType ) {
-
             ConversionProvider conversionProvider = context.conversions.getConversion( sourceType, targetType );
 
             if ( conversionProvider == null ) {
@@ -234,8 +234,7 @@ public class MappingResolver {
             }
 
             ConversionContext ctx = new DefaultConversionContext( context.typeFactory, targetType, dateFormat );
-            Assignment typeConversion = conversionProvider.to( ctx );
-            return typeConversion;
+            return conversionProvider.to( ctx );
         }
 
         /**
@@ -372,7 +371,7 @@ public class MappingResolver {
 
             Assignment conversionYRef = null;
 
-            // search the other way arround
+            // search the other way around
             for ( Method methodXCandidate : methodXCandidates ) {
                 if ( methodXCandidate.getSourceParameters().size() == 1 ) {
                     Assignment methodRefX = resolveViaMethod(