diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterDatabaseImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterDatabaseImpl.java
index 929392f482..7d534e10fc 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AlterDatabaseImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AlterDatabaseImpl.java
@@ -91,9 +91,9 @@ implements
     }
 
     // -------------------------------------------------------------------------
-    // XXX DSL API
+    // XXX: DSL API
     // -------------------------------------------------------------------------
-
+    
     @Override
     public final AlterDatabaseImpl renameTo(String renameTo) {
         return renameTo(DSL.catalog(renameTo));
@@ -115,7 +115,7 @@ implements
     }
 
     // -------------------------------------------------------------------------
-    // XXX QueryPart API
+    // XXX: QueryPart API
     // -------------------------------------------------------------------------
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterDomainImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterDomainImpl.java
index 30c196ad68..70b06731e0 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AlterDomainImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AlterDomainImpl.java
@@ -137,9 +137,9 @@ implements
     }
 
     // -------------------------------------------------------------------------
-    // XXX DSL API
+    // XXX: DSL API
     // -------------------------------------------------------------------------
-
+    
     @Override
     public final AlterDomainImpl<T> add(Constraint addConstraint) {
         return new AlterDomainImpl<>(
@@ -479,7 +479,7 @@ implements
     }
 
     // -------------------------------------------------------------------------
-    // XXX QueryPart API
+    // XXX: QueryPart API
     // -------------------------------------------------------------------------
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateDatabaseImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateDatabaseImpl.java
index be576683ea..7a5b49e467 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CreateDatabaseImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CreateDatabaseImpl.java
@@ -75,11 +75,7 @@ implements
     }
 
     // -------------------------------------------------------------------------
-    // XXX DSL API
-    // -------------------------------------------------------------------------
-
-    // -------------------------------------------------------------------------
-    // XXX QueryPart API
+    // XXX: QueryPart API
     // -------------------------------------------------------------------------
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateDomainImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateDomainImpl.java
index 72a3b26483..1723060ff9 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CreateDomainImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CreateDomainImpl.java
@@ -101,9 +101,9 @@ implements
     }
 
     // -------------------------------------------------------------------------
-    // XXX DSL API
+    // XXX: DSL API
     // -------------------------------------------------------------------------
-
+    
     @Override
     public final <T> CreateDomainImpl<T> as(Class<T> dataType) {
         return as(DefaultDataType.getDataType(null, dataType));
@@ -156,7 +156,7 @@ implements
     }
 
     // -------------------------------------------------------------------------
-    // XXX QueryPart API
+    // XXX: QueryPart API
     // -------------------------------------------------------------------------
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/DropDatabaseImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropDatabaseImpl.java
index 7c42f81178..573e339eea 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DropDatabaseImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DropDatabaseImpl.java
@@ -37,26 +37,14 @@
  */
 package org.jooq.impl;
 
-// ...
-// ...
-// ...
-import static org.jooq.SQLDialect.DERBY;
-import static org.jooq.SQLDialect.FIREBIRD;
-// ...
-// ...
-// ...
-// ...
-import static org.jooq.impl.Keywords.K_DATABASE;
-import static org.jooq.impl.Keywords.K_DROP;
-import static org.jooq.impl.Keywords.K_IF_EXISTS;
+import static org.jooq.impl.Keywords.*;
+import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.SQLDialect.*;
 
-import java.util.Set;
+import org.jooq.*;
+import org.jooq.impl.*;
 
-import org.jooq.Catalog;
-import org.jooq.Configuration;
-import org.jooq.Context;
-import org.jooq.DropDatabaseFinalStep;
-import org.jooq.SQLDialect;
+import java.util.*;
 
 /**
  * The <code>DROP DATABASE IF EXISTS</code> statement.
@@ -68,13 +56,13 @@ extends
 implements
     DropDatabaseFinalStep
 {
-
+    
     private static final long serialVersionUID = 1L;
 
     private final Catalog database;
     private final boolean ifExists;
-
-
+    
+    
     DropDatabaseImpl(
         Configuration configuration,
         Catalog database,
@@ -87,11 +75,7 @@ implements
     }
 
     // -------------------------------------------------------------------------
-    // XXX DSL API
-    // -------------------------------------------------------------------------
-
-    // -------------------------------------------------------------------------
-    // XXX QueryPart API
+    // XXX: QueryPart API
     // -------------------------------------------------------------------------
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/DropDomainImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropDomainImpl.java
index 0507da97c2..055b7f00b9 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DropDomainImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DropDomainImpl.java
@@ -91,9 +91,9 @@ implements
     }
 
     // -------------------------------------------------------------------------
-    // XXX DSL API
+    // XXX: DSL API
     // -------------------------------------------------------------------------
-
+    
     @Override
     public final DropDomainImpl cascade() {
         return new DropDomainImpl(
@@ -115,7 +115,7 @@ implements
     }
 
     // -------------------------------------------------------------------------
-    // XXX QueryPart API
+    // XXX: QueryPart API
     // -------------------------------------------------------------------------