diff --git a/src/main/java/com/aerospike/mapper/tools/mappers/DateMapper.java b/src/main/java/com/aerospike/mapper/tools/mappers/DateMapper.java
index 48fd508..c9d1fdf 100644
--- a/src/main/java/com/aerospike/mapper/tools/mappers/DateMapper.java
+++ b/src/main/java/com/aerospike/mapper/tools/mappers/DateMapper.java
@@ -22,5 +22,4 @@ public Object fromAerospikeFormat(Object value) {
 		long longValue = (Long)value;
 		return new Date(longValue);
 	}
-
 }
diff --git a/src/main/java/com/aerospike/mapper/tools/mappers/EnumMapper.java b/src/main/java/com/aerospike/mapper/tools/mappers/EnumMapper.java
index d596213..e3195ab 100644
--- a/src/main/java/com/aerospike/mapper/tools/mappers/EnumMapper.java
+++ b/src/main/java/com/aerospike/mapper/tools/mappers/EnumMapper.java
@@ -10,6 +10,7 @@ public class EnumMapper extends TypeMapper {
 	public EnumMapper(Class<? extends Enum<?>> clazz) {
 		this.clazz = clazz;
 	}
+
 	@Override
 	public Object toAerospikeFormat(Object value) {
 		return value.toString();
@@ -30,5 +31,4 @@ public Object fromAerospikeFormat(Object value) {
 		
 		throw new AerospikeException(String.format("Enum value of \"%s\" not found in type %s", stringValue, clazz.toString()));
 	}
-
 }
diff --git a/src/main/java/com/aerospike/mapper/tools/mappers/InstantMapper.java b/src/main/java/com/aerospike/mapper/tools/mappers/InstantMapper.java
index fa3b546..9e46ee0 100644
--- a/src/main/java/com/aerospike/mapper/tools/mappers/InstantMapper.java
+++ b/src/main/java/com/aerospike/mapper/tools/mappers/InstantMapper.java
@@ -12,8 +12,7 @@ public Object toAerospikeFormat(Object value) {
 			return null;
 		}
 		Instant instant = (Instant)value;
-		long time = instant.getEpochSecond() * 1_000_000_000 + instant.getNano();
-		return time;
+		return instant.getEpochSecond() * 1_000_000_000 + instant.getNano();
 	}
 
 	@Override
@@ -24,5 +23,4 @@ public Object fromAerospikeFormat(Object value) {
 		long longValue = (Long)value;
 		return Instant.ofEpochSecond(longValue/1_000_000_000, longValue % 1_000_000_000);
 	}
-
 }
diff --git a/src/main/java/com/aerospike/mapper/tools/mappers/ListMapper.java b/src/main/java/com/aerospike/mapper/tools/mappers/ListMapper.java
index adc5284..81342ab 100644
--- a/src/main/java/com/aerospike/mapper/tools/mappers/ListMapper.java
+++ b/src/main/java/com/aerospike/mapper/tools/mappers/ListMapper.java
@@ -1,26 +1,16 @@
 package com.aerospike.mapper.tools.mappers;
 
-import java.util.AbstractMap;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.TreeMap;
-
 import com.aerospike.client.AerospikeException;
-import com.aerospike.mapper.annotations.AerospikeReference;
 import com.aerospike.mapper.annotations.AerospikeEmbed.EmbedType;
-import com.aerospike.mapper.tools.AeroMapper;
-import com.aerospike.mapper.tools.ClassCache;
-import com.aerospike.mapper.tools.ClassCacheEntry;
-import com.aerospike.mapper.tools.DeferredObjectLoader;
+import com.aerospike.mapper.tools.*;
 import com.aerospike.mapper.tools.DeferredObjectLoader.DeferredObject;
 import com.aerospike.mapper.tools.DeferredObjectLoader.DeferredObjectSetter;
 import com.aerospike.mapper.tools.DeferredObjectLoader.DeferredSetter;
-import com.aerospike.mapper.tools.TypeMapper;
-import com.aerospike.mapper.tools.TypeUtils;
 import com.aerospike.mapper.tools.TypeUtils.AnnotatedType;
 
+import java.util.*;
+import java.util.Map.Entry;
+
 public class ListMapper extends TypeMapper {
 
 	@SuppressWarnings("unused")
@@ -96,7 +86,7 @@ public Object toAerospikeInstanceFormat(Object obj) {
 				// This class must be a subclass of the annotated type
 				item = this.instanceClassMapper.toAerospikeFormat(obj, false, true);
 			}
-			return new AbstractMap.SimpleEntry<Object, Object>(key, item);
+			return new AbstractMap.SimpleEntry<>(key, item);
 		}
 	}
 	
@@ -188,9 +178,9 @@ public Object fromAerospikeFormat(Object value) {
 				return value;
 			}
 
+			int index = 0;
 			if (instanceClass == null) {
 				// We don't have any hints as to how to translate them, we have to look up each type
-				int index = 0;
 				for (Object obj : list) {
 					if (obj == null) {
 						results.add(null);
@@ -219,7 +209,6 @@ public void setValue(Object object) {
 				}
 			}
 			else {
-				int index = 0;
 				for (Object obj : list) {
 					if (!allowBatchLoad) {
 						results.add(this.instanceClassMapper.fromAerospikeFormat(obj));
diff --git a/src/main/java/com/aerospike/mapper/tools/mappers/ObjectEmbedMapper.java b/src/main/java/com/aerospike/mapper/tools/mappers/ObjectEmbedMapper.java
index 77f12f9..2e47cbf 100644
--- a/src/main/java/com/aerospike/mapper/tools/mappers/ObjectEmbedMapper.java
+++ b/src/main/java/com/aerospike/mapper/tools/mappers/ObjectEmbedMapper.java
@@ -8,7 +8,6 @@
 import com.aerospike.mapper.tools.AeroMapper;
 import com.aerospike.mapper.tools.ClassCache;
 import com.aerospike.mapper.tools.ClassCacheEntry;
-import com.aerospike.mapper.tools.TypeMapper;
 
 public class ObjectEmbedMapper extends ObjectMapper {
 
@@ -50,7 +49,7 @@ public Object fromAerospikeFormat(Object value) {
 		}
 		ClassCacheEntry<?> entry = ClassCache.getInstance().loadClass(referencedClass, this.mapper);
 		try {
-			Object instance = null;
+			Object instance;
 			
 			switch (type) {
 			case LIST:
diff --git a/src/main/java/com/aerospike/mapper/tools/mappers/ObjectReferenceMapper.java b/src/main/java/com/aerospike/mapper/tools/mappers/ObjectReferenceMapper.java
index 9161cca..609643a 100644
--- a/src/main/java/com/aerospike/mapper/tools/mappers/ObjectReferenceMapper.java
+++ b/src/main/java/com/aerospike/mapper/tools/mappers/ObjectReferenceMapper.java
@@ -97,15 +97,14 @@ public Object fromAerospikeFormat(Object value) {
 		}
 		
 		if (this.lazy) {
-//				Object instance = classToUse.getUnderlyingClass().newInstance();
+			//Object instance = classToUse.getUnderlyingClass().newInstance();
 			Map<String, Object> map = new HashMap<>();
 			Object instance = classToUse.constructAndHydrate(map);
 			classToUse.setKey(instance, key);
 			return instance;
 		}
 		else if (allowBatch) {
-			DeferredObject defObject = new DeferredObject(key, classToUse.getUnderlyingClass(), ReferenceType.DIGEST.equals(type));
-			return defObject;
+			return new DeferredObject(key, classToUse.getUnderlyingClass(), ReferenceType.DIGEST.equals(type));
 		}
 		else if (ReferenceType.DIGEST.equals(type)) {
 			return mapper.readFromDigest(classToUse.getUnderlyingClass(), (byte[]) key, false);