diff --git a/src/main/java/com/avaje/ebean/config/DataSourceConfig.java b/src/main/java/com/avaje/ebean/config/DataSourceConfig.java
index 6f4c27a5f..4168a64f8 100644
--- a/src/main/java/com/avaje/ebean/config/DataSourceConfig.java
+++ b/src/main/java/com/avaje/ebean/config/DataSourceConfig.java
@@ -507,8 +507,7 @@ public class DataSourceConfig {
 
     String customProperties = properties.get("customProperties", null);
     if (customProperties != null && customProperties.length() > 0) {
-      Map<String, String> custProps = StringHelper.delimitedToMap(customProperties, ";", "=");
-      this.customProperties = custProps;
+      this.customProperties = StringHelper.delimitedToMap(customProperties, ";", "=");;
     }
 
   }
diff --git a/src/main/java/com/avaje/ebeaninternal/server/lib/resource/FileResourceContent.java b/src/main/java/com/avaje/ebeaninternal/server/lib/resource/FileResourceContent.java
index 7c0e9fff4..6ed1d1561 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/lib/resource/FileResourceContent.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/lib/resource/FileResourceContent.java
@@ -65,7 +65,6 @@ public class FileResourceContent implements ResourceContent {
      */
     public InputStream getInputStream() throws IOException {
 
-        FileInputStream is = new FileInputStream(file);
-        return is;
+        return new FileInputStream(file);
     }
 }
diff --git a/src/main/java/com/avaje/ebeaninternal/server/lib/resource/FileResourceSource.java b/src/main/java/com/avaje/ebeaninternal/server/lib/resource/FileResourceSource.java
index 1f9a7461d..267037998 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/lib/resource/FileResourceSource.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/lib/resource/FileResourceSource.java
@@ -43,8 +43,7 @@ public class FileResourceSource extends AbstractResourceSource implements Resour
         
         File f = new File(fullPath);
         if (f.exists()){
-            FileResourceContent content = new FileResourceContent(f, entry);
-            return content;
+            return new FileResourceContent(f, entry);
         }
         return null;
     }
diff --git a/src/main/java/com/avaje/ebeaninternal/server/lib/sql/Prefix.java b/src/main/java/com/avaje/ebeaninternal/server/lib/sql/Prefix.java
index 4e58e8f1b..bed1fad49 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/lib/sql/Prefix.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/lib/sql/Prefix.java
@@ -17,8 +17,7 @@ public class Prefix {
 	public static String getProp(String prop) {
 		String v = dec(prop);
 		int p = v.indexOf(":");
-		String r = v.substring(1, p);
-		return r;
+		return v.substring(1, p);
 	}
 
 	public static void main(String[] args) {
@@ -63,9 +62,8 @@ public class Prefix {
 
 		encbytes[0] = az((byte) k, oa[0]);
 		// dp("key:"+key+" encbytes[0]:"+(byte)encbytes[0]);
-		int ios = key;
-		for (int i = 1; i < (msgbytes.length + 1); i++) {
-			encbytes[i] = az(msgbytes[i - 1], (oa[(i + ios) % oa.length]));
+    for (int i = 1; i < (msgbytes.length + 1); i++) {
+			encbytes[i] = az(msgbytes[i - 1], (oa[(i + key) % oa.length]));
 		}
 		return new String(encbytes);
 	}
diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/UpdatePlan.java b/src/main/java/com/avaje/ebeaninternal/server/persist/dml/UpdatePlan.java
index 093764da7..599f021b5 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/UpdatePlan.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/persist/dml/UpdatePlan.java
@@ -77,8 +77,7 @@ public class UpdatePlan implements SpiUpdatePlan {
     set.dmlBind(bind, bean);
 
     // not strictly 'thread safe' but object assignment is atomic
-    Long touched = Long.valueOf(System.currentTimeMillis());
-    this.timeLastUsed = touched;
+    this.timeLastUsed = System.currentTimeMillis();
   }
 
   /**
diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/RawSqlSelectClauseBuilder.java b/src/main/java/com/avaje/ebeaninternal/server/query/RawSqlSelectClauseBuilder.java
index ac1b00945..1f21268ed 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/query/RawSqlSelectClauseBuilder.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/query/RawSqlSelectClauseBuilder.java
@@ -84,9 +84,7 @@ public class RawSqlSelectClauseBuilder {
             SqlTree sqlTree = sqlSelect.getSqlTree();
 
             CQueryPlan queryPlan = new CQueryPlan(request, sql, sqlTree, true, includeRowNumColumn, "");
-            CQuery<T> compiledQuery = new CQuery<T>(request, predicates, queryPlan);
-
-            return compiledQuery;
+            return new CQuery<T>(request, predicates, queryPlan);
 
         } catch (Exception e) {
 
diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/reflect/ReflectionBasedTypeBuilder.java b/src/main/java/com/avaje/ebeaninternal/server/type/reflect/ReflectionBasedTypeBuilder.java
index 1cc5857c8..e3874ae85 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/type/reflect/ReflectionBasedTypeBuilder.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/type/reflect/ReflectionBasedTypeBuilder.java
@@ -33,9 +33,7 @@ public class ReflectionBasedTypeBuilder {
         
         ReflectionBasedScalarTypeConverter r = new ReflectionBasedScalarTypeConverter(constructor, readers[0]);
         
-        ScalarTypeWrapper st = new ScalarTypeWrapper(logicalType, scalarType, r);
-        
-        return st;
+        return new ScalarTypeWrapper(logicalType, scalarType, r);
     }
     
     public ReflectionBasedCompoundType buildCompound(ImmutableMeta meta) {