diff --git a/src/main/java/com/avaje/ebean/TxType.java b/src/main/java/com/avaje/ebean/TxType.java
index 812baa35a..e1cb19511 100644
--- a/src/main/java/com/avaje/ebean/TxType.java
+++ b/src/main/java/com/avaje/ebean/TxType.java
@@ -46,5 +46,5 @@ public enum TxType {
    * If there is an existing transaction throws an Exception. Method runs
    * without a transaction.
    */
-  NEVER;
+  NEVER
 }
diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/IdType.java b/src/main/java/com/avaje/ebean/config/dbplatform/IdType.java
index c5868daae..e12ec8f95 100644
--- a/src/main/java/com/avaje/ebean/config/dbplatform/IdType.java
+++ b/src/main/java/com/avaje/ebean/config/dbplatform/IdType.java
@@ -26,6 +26,6 @@ public enum IdType {
    * id properties of type UUID.
    * </p>
    */
-  GENERATOR;
+  GENERATOR
 
 }
diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/PersistRequestUpdateSql.java b/src/main/java/com/avaje/ebeaninternal/server/core/PersistRequestUpdateSql.java
index 14610b3ba..5bcc24e78 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/core/PersistRequestUpdateSql.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/core/PersistRequestUpdateSql.java
@@ -15,7 +15,7 @@ public final class PersistRequestUpdateSql extends PersistRequest {
 
 	public enum SqlType {
 		SQL_UPDATE, SQL_DELETE, SQL_INSERT, SQL_UNKNOWN
-	};
+	}
 
 	private final SpiSqlUpdate updateSql;
 
diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/GeneratedPropertyFactory.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/GeneratedPropertyFactory.java
index bdf6b6173..db33ffe8e 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/GeneratedPropertyFactory.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/GeneratedPropertyFactory.java
@@ -11,7 +11,7 @@ import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanProperty;
  */
 public class GeneratedPropertyFactory {
 
-	private final CounterFactory counterFactory = new CounterFactory();;
+	private final CounterFactory counterFactory = new CounterFactory();
 
   private final InsertTimestampFactory insertFactory = new InsertTimestampFactory();
 
diff --git a/src/main/java/com/avaje/ebeaninternal/server/lib/DaemonScheduleThreadPool.java b/src/main/java/com/avaje/ebeaninternal/server/lib/DaemonScheduleThreadPool.java
index d247f8ef4..01f37ed29 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/lib/DaemonScheduleThreadPool.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/lib/DaemonScheduleThreadPool.java
@@ -75,5 +75,5 @@ public final class DaemonScheduleThreadPool extends ScheduledThreadPoolExecutor
     public void run() {
       shutdown();
     }
-  };
+  }
 }
diff --git a/src/main/java/com/avaje/ebeaninternal/server/lib/DaemonThreadPool.java b/src/main/java/com/avaje/ebeaninternal/server/lib/DaemonThreadPool.java
index 7ce19ae24..c10a1251a 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/lib/DaemonThreadPool.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/lib/DaemonThreadPool.java
@@ -82,5 +82,5 @@ public final class DaemonThreadPool extends ThreadPoolExecutor {
     public void run() {
       shutdown();
     }
-  };
+  }
 }
diff --git a/src/main/java/com/avaje/ebeaninternal/server/lib/ShutdownHook.java b/src/main/java/com/avaje/ebeaninternal/server/lib/ShutdownHook.java
index 772b25d34..7611ce412 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/lib/ShutdownHook.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/lib/ShutdownHook.java
@@ -19,4 +19,4 @@ class ShutdownHook extends Thread {
 		ShutdownManager.shutdown();
 	}
 
-}; 
+}
diff --git a/src/main/java/com/avaje/ebeaninternal/server/lib/util/MimeTypeHelper.java b/src/main/java/com/avaje/ebeaninternal/server/lib/util/MimeTypeHelper.java
index 199281cd0..7d0e59fb0 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/lib/util/MimeTypeHelper.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/lib/util/MimeTypeHelper.java
@@ -37,4 +37,4 @@ public class MimeTypeHelper {
 	private static ResourceBundle resources = ResourceBundle.getBundle("com.avaje.lib.util.mimetypes");
 
 
-};
+}
diff --git a/src/main/java/com/avaje/ebeaninternal/server/lib/util/StringParsingException.java b/src/main/java/com/avaje/ebeaninternal/server/lib/util/StringParsingException.java
index e55872587..fb0a2e4c7 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/lib/util/StringParsingException.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/lib/util/StringParsingException.java
@@ -6,10 +6,10 @@ package com.avaje.ebeaninternal.server.lib.util;
  */
 public class StringParsingException extends RuntimeException {
 
-    static final long serialVersionUID = -3070423471260426402L;
-    
-	public StringParsingException(String message) {
-		super(message);
-	}
-}; 
+  static final long serialVersionUID = -3070423471260426402L;
+
+  public StringParsingException(String message) {
+    super(message);
+  }
+}