diff --git a/src/main/java/com/datastax/driver/core/schemabuilder/CreateMaterializedView.java b/src/main/java/com/datastax/driver/core/schemabuilder/CreateMaterializedView.java
index d6ba093..70e0ae6 100644
--- a/src/main/java/com/datastax/driver/core/schemabuilder/CreateMaterializedView.java
+++ b/src/main/java/com/datastax/driver/core/schemabuilder/CreateMaterializedView.java
@@ -5,7 +5,7 @@ import com.datastax.driver.core.querybuilder.Select;
 
 public class CreateMaterializedView extends Create {
 
-  private String viewName;
+  private final String viewName;
   private Select.Where selection;
   private String primaryKey;
   private String clustering;
diff --git a/src/main/java/net/helenus/core/AbstractAuditedEntityDraft.java b/src/main/java/net/helenus/core/AbstractAuditedEntityDraft.java
index a9a09e2..d0b76e8 100644
--- a/src/main/java/net/helenus/core/AbstractAuditedEntityDraft.java
+++ b/src/main/java/net/helenus/core/AbstractAuditedEntityDraft.java
@@ -33,6 +33,6 @@ public abstract class AbstractAuditedEntityDraft<E> extends AbstractEntityDraft<
   }
 
   public Date createdAt() {
-    return (Date) get("createdAt", Date.class);
+    return get("createdAt", Date.class);
   }
 }
diff --git a/src/main/java/net/helenus/core/AbstractEntityDraft.java b/src/main/java/net/helenus/core/AbstractEntityDraft.java
index 4315034..e1dd4f0 100644
--- a/src/main/java/net/helenus/core/AbstractEntityDraft.java
+++ b/src/main/java/net/helenus/core/AbstractEntityDraft.java
@@ -1,8 +1,6 @@
 package net.helenus.core;
 
 import com.google.common.primitives.Primitives;
-import java.io.Serializable;
-import java.util.*;
 import net.helenus.core.reflect.DefaultPrimitiveTypes;
 import net.helenus.core.reflect.Drafted;
 import net.helenus.core.reflect.MapExportable;
@@ -10,6 +8,14 @@ import net.helenus.mapping.HelenusProperty;
 import net.helenus.mapping.MappingUtil;
 import org.apache.commons.lang3.SerializationUtils;
 
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+
 public abstract class AbstractEntityDraft<E> implements Drafted<E> {
 
   private final MapExportable entity;
diff --git a/src/main/java/net/helenus/core/AbstractUnitOfWork.java b/src/main/java/net/helenus/core/AbstractUnitOfWork.java
index bf283a2..87f45bf 100644
--- a/src/main/java/net/helenus/core/AbstractUnitOfWork.java
+++ b/src/main/java/net/helenus/core/AbstractUnitOfWork.java
@@ -56,7 +56,7 @@ public abstract class AbstractUnitOfWork<E extends Exception>
   protected int databaseLookups = 0;
   protected Stopwatch elapsedTime;
   protected Map<String, Double> databaseTime = new HashMap<>();
-  protected double cacheLookupTime = 0.0;
+  protected double cacheLookupTimeMSecs = 0.0;
   private List<CommitThunk> commitThunks = new ArrayList<CommitThunk>();
   private List<CommitThunk> abortThunks = new ArrayList<CommitThunk>();
   private List<CompletableFuture<?>> asyncOperationFutures = new ArrayList<CompletableFuture<?>>();
@@ -84,7 +84,7 @@ public abstract class AbstractUnitOfWork<E extends Exception>
 
   @Override
   public void addCacheLookupTime(Stopwatch amount) {
-    cacheLookupTime += amount.elapsed(TimeUnit.MICROSECONDS);
+    cacheLookupTimeMSecs += amount.elapsed(TimeUnit.MICROSECONDS);
   }
 
   @Override
@@ -137,7 +137,7 @@ public abstract class AbstractUnitOfWork<E extends Exception>
   public String logTimers(String what) {
     double e = (double) elapsedTime.elapsed(TimeUnit.MICROSECONDS) / 1000.0;
     double d = 0.0;
-    double c = cacheLookupTime / 1000.0;
+    double c = cacheLookupTimeMSecs / 1000.0;
     double fc = (c / e) * 100.0;
     String database = "";
     if (databaseTime.size() > 0) {
@@ -154,7 +154,7 @@ public abstract class AbstractUnitOfWork<E extends Exception>
               databaseLookups, (databaseLookups > 1) ? "ies" : "y", d, fd, String.join(", ", dbt));
     }
     String cache = "";
-    if (cacheLookupTime > 0) {
+    if (cacheLookupTimeMSecs > 0) {
       int cacheLookups = cacheHits + cacheMisses;
       cache =
           String.format(
@@ -162,7 +162,7 @@ public abstract class AbstractUnitOfWork<E extends Exception>
               cacheLookups, cacheLookups > 1 ? "s" : "", c, fc, cacheHits, cacheMisses);
     }
     String da = "";
-    if (databaseTime.size() > 0 || cacheLookupTime > 0) {
+    if (databaseTime.size() > 0 || cacheLookupTimeMSecs > 0) {
       double dat = d + c;
       double daf = (dat / e) * 100;
       da =
@@ -386,7 +386,7 @@ public abstract class AbstractUnitOfWork<E extends Exception>
         parent.cacheHits += cacheHits;
         parent.cacheMisses += cacheMisses;
         parent.databaseLookups += databaseLookups;
-        parent.cacheLookupTime += cacheLookupTime;
+        parent.cacheLookupTimeMSecs += cacheLookupTimeMSecs;
         for (Map.Entry<String, Double> dt : databaseTime.entrySet()) {
           String name = dt.getKey();
           if (parent.databaseTime.containsKey(name)) {
@@ -398,6 +398,7 @@ public abstract class AbstractUnitOfWork<E extends Exception>
         }
       }
     }
+    // TODO(gburd): hopefully we'll be able to detect conflicts here and so we'd want to...
     // else {
     // Constructor<T> ctor = clazz.getConstructor(conflictExceptionClass);
     // T object = ctor.newInstance(new Object[] { String message });
@@ -435,6 +436,7 @@ public abstract class AbstractUnitOfWork<E extends Exception>
                 uow.abortThunks.clear();
               });
 
+      // TODO(gburd): when we integrate the transaction support we'll need to...
       // log.record(txn::abort)
       // cache.invalidateSince(txn::start time)
     }
@@ -472,8 +474,7 @@ public abstract class AbstractUnitOfWork<E extends Exception>
 
   @Override
   public void close() throws E {
-    // Closing a AbstractUnitOfWork will abort iff we've not already aborted or
-    // committed this unit of work.
+    // Closing a AbstractUnitOfWork will abort iff we've not already aborted or committed this unit of work.
     if (aborted == false && committed == false) {
       abort();
     }
diff --git a/src/main/java/net/helenus/core/Filter.java b/src/main/java/net/helenus/core/Filter.java
index fc5534f..e41fbbc 100644
--- a/src/main/java/net/helenus/core/Filter.java
+++ b/src/main/java/net/helenus/core/Filter.java
@@ -15,8 +15,9 @@
  */
 package net.helenus.core;
 
-import com.datastax.driver.core.querybuilder.Clause;
 import java.util.Objects;
+
+import com.datastax.driver.core.querybuilder.Clause;
 import net.helenus.core.reflect.HelenusPropertyNode;
 import net.helenus.mapping.MappingUtil;
 import net.helenus.mapping.value.ColumnValuePreparer;