diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/CounterFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/CounterFactory.java
index 1bfd2542e..999deb121 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/CounterFactory.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/CounterFactory.java
@@ -13,14 +13,13 @@ import java.sql.Types;
  * Aka, Integer, Long, Short etc.
  * </p>
  */
-class CounterFactory {
+final class CounterFactory {
 
   private final GeneratedCounterInteger integerCounter = new GeneratedCounterInteger();
 
   private final GeneratedCounterLong longCounter = new GeneratedCounterLong();
 
-  public void setCounter(DeployBeanProperty property) {
-
+   void setCounter(DeployBeanProperty property) {
     property.setGeneratedProperty(createCounter(property));
   }
 
@@ -28,7 +27,6 @@ class CounterFactory {
    * Create the GeneratedProperty based on the property type.
    */
   private GeneratedProperty createCounter(DeployBeanProperty property) {
-
     Class<?> propType = property.getPropertyType();
     if (propType.equals(Integer.class) || propType.equals(int.class)) {
       return integerCounter;
@@ -36,7 +34,6 @@ class CounterFactory {
     if (propType.equals(Long.class) || propType.equals(long.class)) {
       return longCounter;
     }
-
     int type = getType(propType);
     return new GeneratedCounter(type);
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounter.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounter.java
index 319e6e40a..38f0085fb 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounter.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounter.java
@@ -7,7 +7,7 @@ import io.ebeaninternal.server.deploy.BeanProperty;
 /**
  * A general number counter for various number types.
  */
-public class GeneratedCounter implements GeneratedProperty {
+final class GeneratedCounter implements GeneratedProperty {
 
   private final int numberType;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounterInteger.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounterInteger.java
index 88cd3a866..4031465e8 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounterInteger.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounterInteger.java
@@ -6,11 +6,7 @@ import io.ebeaninternal.server.deploy.BeanProperty;
 /**
  * Used to create a counter version column for Integer.
  */
-public class GeneratedCounterInteger implements GeneratedProperty {
-
-  public GeneratedCounterInteger() {
-
-  }
+final class GeneratedCounterInteger implements GeneratedProperty {
 
   /**
    * Always returns a 1.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounterLong.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounterLong.java
index 310242465..5282bec11 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounterLong.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounterLong.java
@@ -6,11 +6,7 @@ import io.ebeaninternal.server.deploy.BeanProperty;
 /**
  * Used to create a counter version column for Long.
  */
-public class GeneratedCounterLong implements GeneratedProperty {
-
-  public GeneratedCounterLong() {
-
-  }
+final class GeneratedCounterLong implements GeneratedProperty {
 
   /**
    * Always returns a 1.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertDate.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertDate.java
index 2bb206e3d..57ff0c9bd 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertDate.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertDate.java
@@ -8,7 +8,7 @@ import java.util.Date;
 /**
  * Used to generate a (java.util.Date) timestamp when a bean is inserted.
  */
-public class GeneratedInsertDate implements GeneratedProperty, GeneratedWhenCreated {
+final class GeneratedInsertDate implements GeneratedProperty, GeneratedWhenCreated {
 
   /**
    * Return the current time as a Timestamp.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertJavaTime.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertJavaTime.java
index 3b95b4e0d..f71aaccfd 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertJavaTime.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertJavaTime.java
@@ -6,9 +6,9 @@ import io.ebeaninternal.server.deploy.BeanProperty;
 /**
  * Support java.time types as GeneratedProperty.
  */
-public class GeneratedInsertJavaTime {
+final class GeneratedInsertJavaTime {
 
-  public static abstract class Base implements GeneratedProperty, GeneratedWhenCreated {
+  static abstract class Base implements GeneratedProperty, GeneratedWhenCreated {
 
     @Override
     public boolean includeInUpdate() {
@@ -39,7 +39,7 @@ public class GeneratedInsertJavaTime {
   /**
    * Instant support.
    */
-  public static class InstantDT extends Base {
+  static final class InstantDT extends Base {
 
     @Override
     public Object getInsertValue(BeanProperty prop, EntityBean bean, long now) {
@@ -50,7 +50,7 @@ public class GeneratedInsertJavaTime {
   /**
    * LocalDateTime support.
    */
-  public static class LocalDT extends Base {
+  static final class LocalDT extends Base {
 
     @Override
     public Object getInsertValue(BeanProperty prop, EntityBean bean, long now) {
@@ -61,7 +61,7 @@ public class GeneratedInsertJavaTime {
   /**
    * OffsetDateTime support.
    */
-  public static class OffsetDT extends Base {
+  static final class OffsetDT extends Base {
 
     @Override
     public Object getInsertValue(BeanProperty prop, EntityBean bean, long now) {
@@ -73,7 +73,7 @@ public class GeneratedInsertJavaTime {
   /**
    * ZonedDateTime support.
    */
-  public static class ZonedDT extends Base {
+  static final class ZonedDT extends Base {
 
     @Override
     public Object getInsertValue(BeanProperty prop, EntityBean bean, long now) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertJodaTime.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertJodaTime.java
index f346be035..5a4c11550 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertJodaTime.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertJodaTime.java
@@ -8,9 +8,9 @@ import org.joda.time.LocalDateTime;
 /**
  * Support joda time types as GeneratedProperty.
  */
-public class GeneratedInsertJodaTime {
+final class GeneratedInsertJodaTime {
 
-  public static abstract class Base implements GeneratedProperty, GeneratedWhenCreated {
+  static abstract class Base implements GeneratedProperty, GeneratedWhenCreated {
 
     @Override
     public boolean includeInUpdate() {
@@ -41,7 +41,7 @@ public class GeneratedInsertJodaTime {
   /**
    * LocalDateTime support.
    */
-  public static class LocalDT extends Base {
+  static final class LocalDT extends Base {
 
     @Override
     public Object getInsertValue(BeanProperty prop, EntityBean bean, long now) {
@@ -52,7 +52,7 @@ public class GeneratedInsertJodaTime {
   /**
    * DateTime support.
    */
-  public static class DateTimeDT extends Base {
+  static final class DateTimeDT extends Base {
 
     @Override
     public Object getInsertValue(BeanProperty prop, EntityBean bean, long now) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertLong.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertLong.java
index f56f97490..5e3e0d2f1 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertLong.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertLong.java
@@ -6,7 +6,7 @@ import io.ebeaninternal.server.deploy.BeanProperty;
 /**
  * Used to generate a (Long) timestamp when a bean is inserted.
  */
-public class GeneratedInsertLong implements GeneratedProperty {
+final class GeneratedInsertLong implements GeneratedProperty {
 
   /**
    * Return the current time as a Timestamp.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertTimestamp.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertTimestamp.java
index abc7f963c..028f71a10 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertTimestamp.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertTimestamp.java
@@ -8,7 +8,7 @@ import java.sql.Timestamp;
 /**
  * Used to generate a timestamp when a bean is inserted.
  */
-public class GeneratedInsertTimestamp implements GeneratedProperty, GeneratedWhenCreated {
+final class GeneratedInsertTimestamp implements GeneratedProperty, GeneratedWhenCreated {
 
   /**
    * Return the current time as a Timestamp.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedPropertyFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedPropertyFactory.java
index b395732b0..e876fb379 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedPropertyFactory.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedPropertyFactory.java
@@ -17,24 +17,16 @@ import java.util.Map;
 /**
  * Default implementation of GeneratedPropertyFactory.
  */
-public class GeneratedPropertyFactory {
+public final class GeneratedPropertyFactory {
 
   private final CounterFactory counterFactory = new CounterFactory();
-
   private final InsertTimestampFactory insertFactory;
-
   private final UpdateTimestampFactory updateFactory;
-
   private final HashSet<String> numberTypes = new HashSet<>();
-
   private final UuidGeneratedProperty generatedUuid = new UuidGeneratedProperty();
-
   private final GeneratedWhoModified generatedWhoModified;
-
   private final GeneratedWhoCreated generatedWhoCreated;
-
   private final ClassLoadConfig classLoadConfig;
-
   private final Map<String, PlatformIdGenerator> idGeneratorMap = new HashMap<>();
 
   public GeneratedPropertyFactory(boolean offlineMode, DatabaseConfig config, List<IdGenerator> idGenerators) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateDate.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateDate.java
index f9cd94659..f8ec8effe 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateDate.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateDate.java
@@ -9,7 +9,7 @@ import java.util.Date;
  * Generate a (java.util.Date) Timestamp whenever the bean is inserted or
  * updated.
  */
-public class GeneratedUpdateDate implements GeneratedProperty {
+final class GeneratedUpdateDate implements GeneratedProperty {
 
   /**
    * Return now as a Timestamp.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateJavaTime.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateJavaTime.java
index 8592425df..6abbf2c6b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateJavaTime.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateJavaTime.java
@@ -6,9 +6,9 @@ import io.ebeaninternal.server.deploy.BeanProperty;
 /**
  * Support java.time DateTime types as GeneratedProperty.
  */
-public class GeneratedUpdateJavaTime {
+final class GeneratedUpdateJavaTime {
 
-  public static abstract class Base implements GeneratedProperty, GeneratedWhenModified {
+  static abstract class Base implements GeneratedProperty, GeneratedWhenModified {
 
     @Override
     public boolean includeInUpdate() {
@@ -34,7 +34,7 @@ public class GeneratedUpdateJavaTime {
   /**
    * Instant support.
    */
-  public static class InstantDT extends Base {
+  static final class InstantDT extends Base {
 
     @Override
     public Object getInsertValue(BeanProperty prop, EntityBean bean, long now) {
@@ -50,7 +50,7 @@ public class GeneratedUpdateJavaTime {
   /**
    * LocalDateTime support.
    */
-  public static class LocalDT extends Base {
+  static final class LocalDT extends Base {
 
     @Override
     public Object getInsertValue(BeanProperty prop, EntityBean bean, long now) {
@@ -66,7 +66,7 @@ public class GeneratedUpdateJavaTime {
   /**
    * OffsetDateTime support.
    */
-  public static class OffsetDT extends Base {
+  static final class OffsetDT extends Base {
 
     @Override
     public Object getInsertValue(BeanProperty prop, EntityBean bean, long now) {
@@ -82,7 +82,7 @@ public class GeneratedUpdateJavaTime {
   /**
    * ZonedDateTime support.
    */
-  public static class ZonedDT extends Base {
+  static final class ZonedDT extends Base {
 
     @Override
     public Object getInsertValue(BeanProperty prop, EntityBean bean, long now) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateJodaTime.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateJodaTime.java
index de4cc1878..ab95ce24a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateJodaTime.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateJodaTime.java
@@ -8,9 +8,9 @@ import org.joda.time.LocalDateTime;
 /**
  * Support java.time DateTime types as GeneratedProperty.
  */
-public class GeneratedUpdateJodaTime {
+final class GeneratedUpdateJodaTime {
 
-  public static abstract class Base implements GeneratedProperty, GeneratedWhenModified {
+  static abstract class Base implements GeneratedProperty, GeneratedWhenModified {
 
     @Override
     public boolean includeInUpdate() {
@@ -36,7 +36,7 @@ public class GeneratedUpdateJodaTime {
   /**
    * LocalDateTime support.
    */
-  public static class LocalDT extends Base {
+  static final class LocalDT extends Base {
 
     @Override
     public Object getInsertValue(BeanProperty prop, EntityBean bean, long now) {
@@ -52,7 +52,7 @@ public class GeneratedUpdateJodaTime {
   /**
    * OffsetDateTime support.
    */
-  public static class DateTimeDT extends Base {
+  static final class DateTimeDT extends Base {
 
     @Override
     public Object getInsertValue(BeanProperty prop, EntityBean bean, long now) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateLong.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateLong.java
index 2d4c85192..72c2b9079 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateLong.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateLong.java
@@ -6,7 +6,7 @@ import io.ebeaninternal.server.deploy.BeanProperty;
 /**
  * Generate a (Long) Timestamp whenever the bean is inserted or updated.
  */
-public class GeneratedUpdateLong implements GeneratedProperty {
+final class GeneratedUpdateLong implements GeneratedProperty {
 
   /**
    * Return now as a Timestamp.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateTimestamp.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateTimestamp.java
index f493401d8..3ee658eb2 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateTimestamp.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateTimestamp.java
@@ -8,7 +8,7 @@ import java.sql.Timestamp;
 /**
  * Generate a Timestamp whenever the bean is inserted or updated.
  */
-public class GeneratedUpdateTimestamp implements GeneratedProperty, GeneratedWhenModified {
+final class GeneratedUpdateTimestamp implements GeneratedProperty, GeneratedWhenModified {
 
   /**
    * Return now as a Timestamp.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedWhoCreated.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedWhoCreated.java
index cdb719014..404f31049 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedWhoCreated.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedWhoCreated.java
@@ -7,7 +7,7 @@ import io.ebeaninternal.server.deploy.BeanProperty;
 /**
  * Used to populate @WhoCreated bean properties.
  */
-public class GeneratedWhoCreated implements GeneratedProperty {
+final class GeneratedWhoCreated implements GeneratedProperty {
 
   private final CurrentUserProvider currentUserProvider;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedWhoModified.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedWhoModified.java
index e4e68a373..c9aa65537 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedWhoModified.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedWhoModified.java
@@ -7,7 +7,7 @@ import io.ebeaninternal.server.deploy.BeanProperty;
 /**
  * Used to populate @WhoModified bean properties.
  */
-public class GeneratedWhoModified implements GeneratedProperty {
+final class GeneratedWhoModified implements GeneratedProperty {
 
   private final CurrentUserProvider currentUserProvider;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactory.java
index ee2c88a66..f5083c632 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactory.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactory.java
@@ -15,7 +15,7 @@ import java.util.Map;
 /**
  * Helper for creating Insert timestamp GeneratedProperty objects.
  */
-class InsertTimestampFactory {
+final class InsertTimestampFactory {
 
   private final Map<Class<?>, GeneratedProperty> map = new HashMap<>();
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/JavaTimeUtils.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/JavaTimeUtils.java
index bf3f6db12..cea0a6e86 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/JavaTimeUtils.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/JavaTimeUtils.java
@@ -9,7 +9,7 @@ import java.time.ZonedDateTime;
 /**
  * Helper methods for Java time conversion.
  */
-class JavaTimeUtils {
+final class JavaTimeUtils {
 
   /**
    * Return the system millis time as a LocalDateTime.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactory.java
index d405f2ec7..d08b75cc6 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactory.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactory.java
@@ -15,7 +15,7 @@ import java.util.Map;
 /**
  * Helper for creating Update timestamp GeneratedProperty objects.
  */
-class UpdateTimestampFactory {
+final class UpdateTimestampFactory {
 
   private final Map<Class<?>, GeneratedProperty> map = new HashMap<>();
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/UuidGeneratedProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/UuidGeneratedProperty.java
index 2090fac13..6eff4c21a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/UuidGeneratedProperty.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/UuidGeneratedProperty.java
@@ -5,7 +5,7 @@ import io.ebeaninternal.server.deploy.BeanProperty;
 
 import java.util.UUID;
 
-public class UuidGeneratedProperty implements GeneratedProperty {
+final class UuidGeneratedProperty implements GeneratedProperty {
 
   @Override
   public Object getInsertValue(BeanProperty prop, EntityBean bean, long now) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderFactory.java
index 70f8a1175..b9bf6f6e6 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderFactory.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderFactory.java
@@ -7,12 +7,11 @@ import io.ebeaninternal.server.persist.platform.MultiValueBind;
 /**
  * Creates the appropriate IdConvertSet depending on the type of Id property(s).
  */
-public class IdBinderFactory {
+public final class IdBinderFactory {
 
   private static final IdBinderEmpty EMPTY = new IdBinderEmpty();
 
   private final boolean idInExpandedForm;
-
   private final MultiValueBind multiValueBind;
 
   public IdBinderFactory(boolean idInExpandedForm, MultiValueBind multiValueBind) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderSimple.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderSimple.java
index cb9e6f9aa..6541b3fa5 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderSimple.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderSimple.java
@@ -26,13 +26,9 @@ import java.util.List;
 public final class IdBinderSimple implements IdBinder {
 
   private final BeanProperty idProperty;
-
   private final String bindIdSql;
-
   private final Class<?> expectedType;
-
   private final MultiValueBind multiValueBind;
-
   @SuppressWarnings("rawtypes")
   private final ScalarType scalarType;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdEmbedded.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdEmbedded.java
index 537575ae8..d0f888582 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdEmbedded.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdEmbedded.java
@@ -18,12 +18,10 @@ import java.sql.SQLException;
 /**
  * Imported Embedded id.
  */
-public class ImportedIdEmbedded implements ImportedId {
+public final class ImportedIdEmbedded implements ImportedId {
 
   private final BeanPropertyAssoc<?> owner;
-
   private final BeanPropertyAssocOne<?> foreignAssocOne;
-
   private final ImportedIdSimple[] imported;
 
   public ImportedIdEmbedded(BeanPropertyAssoc<?> owner, BeanPropertyAssocOne<?> foreignAssocOne, ImportedIdSimple[] imported) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdSimple.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdSimple.java
index ea9844ec1..83f615994 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdSimple.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdSimple.java
@@ -36,23 +36,11 @@ public final class ImportedIdSimple implements ImportedId, Comparable<ImportedId
   private static final EntryComparator COMPARATOR = new EntryComparator();
 
   final BeanPropertyAssoc<?> owner;
-
   final String localDbColumn;
-
   private final String localSqlFormula;
-
   final BeanProperty foreignProperty;
-
   private final int position;
-
-  /**
-   * If true include in insert.
-   */
   private final boolean insertable;
-
-  /**
-   * If true include in update.
-   */
   private final boolean updateable;
 
   public ImportedIdSimple(BeanPropertyAssoc<?> owner, String localDbColumn, String localSqlFormula, BeanProperty foreignProperty, int position,