diff --git a/src/main/java/com/avaje/ebean/util/StringHelper.java b/src/main/java/com/avaje/ebean/util/StringHelper.java
index 6e0a23123..b545fb913 100644
--- a/src/main/java/com/avaje/ebean/util/StringHelper.java
+++ b/src/main/java/com/avaje/ebean/util/StringHelper.java
@@ -512,7 +512,7 @@ public class StringHelper {
       sb.append(source.substring(0, startPos));
     }
 
-    int matchCount = 0;
+    int matchCount;
 
     for (int i = startPos; i < len; i++) {
       sourceChar = source.charAt(i);
diff --git a/src/main/java/com/avaje/ebeaninternal/server/autofetch/TunedQueryInfo.java b/src/main/java/com/avaje/ebeaninternal/server/autofetch/TunedQueryInfo.java
index 5a16492ce..d5eae4870 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/autofetch/TunedQueryInfo.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/autofetch/TunedQueryInfo.java
@@ -108,7 +108,7 @@ public class TunedQueryInfo implements Serializable {
 		    return false;
 		}
 		
-		boolean tuned = false;
+		boolean tuned;
 		//Note: tunedDetail is immutable by convention
 	    if (query.isDetailEmpty()) {
             tuned = true;
diff --git a/src/main/java/com/avaje/ebeaninternal/server/cluster/mcast/McastSender.java b/src/main/java/com/avaje/ebeaninternal/server/cluster/mcast/McastSender.java
index 452eaf5cf..4ea5c86af 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/cluster/mcast/McastSender.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/cluster/mcast/McastSender.java
@@ -37,7 +37,7 @@ public class McastSender {
             this.port = port;
             this.inetAddress = InetAddress.getByName(address);
 
-            InetAddress sendInetAddress = null;
+            InetAddress sendInetAddress;
             if (sendAddress != null) {
                 sendInetAddress = InetAddress.getByName(sendAddress);
             } else {
diff --git a/src/main/java/com/avaje/ebeaninternal/server/cluster/mcast/OutgoingPacketsAcked.java b/src/main/java/com/avaje/ebeaninternal/server/cluster/mcast/OutgoingPacketsAcked.java
index 7232913c7..be95d5802 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/cluster/mcast/OutgoingPacketsAcked.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/cluster/mcast/OutgoingPacketsAcked.java
@@ -51,7 +51,7 @@ public class OutgoingPacketsAcked {
         
         synchronized (this) {
             
-            boolean checkMin = false;
+            boolean checkMin;
             
             GroupMemberAck groupMemberAck = recievedByMap.get(groupMember);
             if (groupMemberAck == null) {
diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/DRawSqlSelectColumnsParser.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/DRawSqlSelectColumnsParser.java
index 75bb32716..f2ac09bfd 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/deploy/DRawSqlSelectColumnsParser.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/DRawSqlSelectColumnsParser.java
@@ -74,8 +74,8 @@ public final class DRawSqlSelectColumnsParser {
 		if (lastSpace > -1) {
 			secLastSpace = colInfo.lastIndexOf(' ', lastSpace - 1);
 		}
-		String colName = null;
-		String colLabel = null;
+		String colName;
+		String colLabel;
 		if (lastSpace == -1) {
 			// no column alias
 			colName = colInfo;
diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/DeployOrmXml.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/DeployOrmXml.java
index 341047380..833d1a5cc 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/deploy/DeployOrmXml.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/DeployOrmXml.java
@@ -106,7 +106,7 @@ public class DeployOrmXml {
 	private void readOrmXml(String ormXmlName, ArrayList<Dnode> ormXmlList) {
 
 		try {
-			Dnode ormXml = null;
+			Dnode ormXml;
 			ResourceContent content = resSource.getContent(ormXmlName);
 			if (content != null) {
 				// servlet resource or file system...
diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/InheritInfo.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/InheritInfo.java
index a38608da0..69291346d 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/deploy/InheritInfo.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/InheritInfo.java
@@ -150,7 +150,7 @@ public class InheritInfo {
    */
   public BeanProperty findSubTypeProperty(String propertyName) {
 
-    BeanProperty prop = null;
+    BeanProperty prop;
 
     for (int i = 0, x = children.size(); i < x; i++) {
       InheritInfo childInfo = children.get(i);
diff --git a/src/main/java/com/avaje/ebeaninternal/server/util/ClassPathSearch.java b/src/main/java/com/avaje/ebeaninternal/server/util/ClassPathSearch.java
index 09f134795..f40653b05 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/util/ClassPathSearch.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/util/ClassPathSearch.java
@@ -175,7 +175,7 @@ public class ClassPathSearch implements ClassPathSearchService {
 
   private ClassPathElement getClassPathElement(Object classPathEntry) throws MalformedURLException {
 
-    URL fileUrl = null;
+    URL fileUrl;
 
     if (URI.class.isInstance(classPathEntry)) {
       fileUrl = ((URI) classPathEntry).toURL();