diff --git a/src/main/java/org/mybatis/dynamic/sql/SqlColumn.java b/src/main/java/org/mybatis/dynamic/sql/SqlColumn.java
index ee372794b..b3dcf9513 100644
--- a/src/main/java/org/mybatis/dynamic/sql/SqlColumn.java
+++ b/src/main/java/org/mybatis/dynamic/sql/SqlColumn.java
@@ -79,7 +79,6 @@
  * method and cast the result properly. We provide a {@link SqlColumn#cast(SqlColumn)} method to aid with this
  * process. For example, overriding the {@code descending} method could look like this:
  *
- * <p>
  * <pre>
  * {@code
  * @Override
@@ -237,8 +236,8 @@ public Optional<RenderingStrategy> renderingStrategy() {
      * and method chaining would not work. This is a workaround for Java's lack of reification.
      *
      * @param typeHandler the type handler to set
-     * @return a new column instance with the specified type handler
      * @param <S> the type of the new column (will be the same as T)
+     * @return a new column instance with the specified type handler
      */
     public <S> SqlColumn<S> withTypeHandler(String typeHandler) {
         return cast(copyBuilder().withTypeHandler(typeHandler).build());
@@ -253,8 +252,8 @@ public <S> SqlColumn<S> withTypeHandler(String typeHandler) {
      * and method chaining would not work. This is a workaround for Java's lack of reification.
      *
      * @param renderingStrategy the rendering strategy to set
-     * @return a new column instance with the specified type handler
      * @param <S> the type of the new column (will be the same as T)
+     * @return a new column instance with the specified type handler
      */
     public <S> SqlColumn<S> withRenderingStrategy(RenderingStrategy renderingStrategy) {
         return cast(copyBuilder().withRenderingStrategy(renderingStrategy).build());
@@ -271,8 +270,8 @@ public <S> SqlColumn<S> withRenderingStrategy(RenderingStrategy renderingStrateg
      * and method chaining would not work. This is a workaround for Java's lack of reification.
      *
      * @param parameterTypeConverter the parameter type converter to set
-     * @return a new column instance with the specified type handler
      * @param <S> the type of the new column (will be the same as T)
+     * @return a new column instance with the specified type handler
      */
     @SuppressWarnings("unchecked")
     public <S> SqlColumn<S> withParameterTypeConverter(ParameterTypeConverter<S, ?> parameterTypeConverter) {
@@ -292,8 +291,8 @@ public <S> SqlColumn<S> withParameterTypeConverter(ParameterTypeConverter<S, ?>
      * and method chaining would not work. This is a workaround for Java's lack of reification.
      *
      * @param javaType the Java type to set
-     * @return a new column instance with the specified type handler
      * @param <S> the type of the new column (will be the same as T)
+     * @return a new column instance with the specified type handler
      */
     @SuppressWarnings("unchecked")
     public <S> SqlColumn<S> withJavaType(Class<S> javaType) {
@@ -312,8 +311,8 @@ public <S> SqlColumn<S> withJavaType(Class<S> javaType) {
      * and method chaining would not work. This is a workaround for Java's lack of reification.
      *
      * @param javaProperty the Java property to set
-     * @return a new column instance with the specified type handler
      * @param <S> the type of the new column (will be the same as T)
+     * @return a new column instance with the specified type handler
      */
     public <S> SqlColumn<S> withJavaProperty(String javaProperty) {
         return cast(copyBuilder().withJavaProperty(javaProperty).build());
@@ -366,7 +365,7 @@ public static <T> SqlColumn<T> of(String name, SqlTable table, JDBCType jdbcType
                 .build();
     }
 
-    public static abstract class AbstractBuilder<T, C extends SqlColumn<T>, B extends AbstractBuilder<T, C, B>> {
+    public abstract static class AbstractBuilder<T, C extends SqlColumn<T>, B extends AbstractBuilder<T, C, B>> {
         protected @Nullable String name;
         protected @Nullable SqlTable table;
         protected @Nullable JDBCType jdbcType;
diff --git a/src/main/java/org/mybatis/dynamic/sql/where/condition/IsGreaterThanOrEqualToWhenPresent.java b/src/main/java/org/mybatis/dynamic/sql/where/condition/IsGreaterThanOrEqualToWhenPresent.java
index ccb868c94..970ef0775 100644
--- a/src/main/java/org/mybatis/dynamic/sql/where/condition/IsGreaterThanOrEqualToWhenPresent.java
+++ b/src/main/java/org/mybatis/dynamic/sql/where/condition/IsGreaterThanOrEqualToWhenPresent.java
@@ -26,16 +26,16 @@ public class IsGreaterThanOrEqualToWhenPresent<T> extends AbstractSingleValueCon
         implements AbstractSingleValueCondition.Filterable<T>, AbstractSingleValueCondition.Mappable<T> {
     private static final IsGreaterThanOrEqualToWhenPresent<?> EMPTY =
             new IsGreaterThanOrEqualToWhenPresent<Object>(-1) {
-        @Override
-        public Object value() {
-            throw new NoSuchElementException("No value present"); //$NON-NLS-1$
-        }
+                @Override
+                public Object value() {
+                    throw new NoSuchElementException("No value present"); //$NON-NLS-1$
+                }
 
-        @Override
-        public boolean isEmpty() {
-            return true;
-        }
-    };
+                @Override
+                public boolean isEmpty() {
+                    return true;
+                }
+            };
 
     public static <T> IsGreaterThanOrEqualToWhenPresent<T> empty() {
         @SuppressWarnings("unchecked")
diff --git a/src/main/java/org/mybatis/dynamic/sql/where/condition/IsLikeCaseInsensitiveWhenPresent.java b/src/main/java/org/mybatis/dynamic/sql/where/condition/IsLikeCaseInsensitiveWhenPresent.java
index ae8398aef..0f06e3311 100644
--- a/src/main/java/org/mybatis/dynamic/sql/where/condition/IsLikeCaseInsensitiveWhenPresent.java
+++ b/src/main/java/org/mybatis/dynamic/sql/where/condition/IsLikeCaseInsensitiveWhenPresent.java
@@ -28,16 +28,16 @@ public class IsLikeCaseInsensitiveWhenPresent<T> extends AbstractSingleValueCond
         AbstractSingleValueCondition.Mappable<T> {
     private static final IsLikeCaseInsensitiveWhenPresent<?> EMPTY =
             new IsLikeCaseInsensitiveWhenPresent<>("") { //$NON-NLS-1$
-        @Override
-        public String value() {
-            throw new NoSuchElementException("No value present"); //$NON-NLS-1$
-        }
+                @Override
+                public String value() {
+                    throw new NoSuchElementException("No value present"); //$NON-NLS-1$
+                }
 
-        @Override
-        public boolean isEmpty() {
-            return true;
-        }
-    };
+                @Override
+                public boolean isEmpty() {
+                    return true;
+                }
+            };
 
     public static <T> IsLikeCaseInsensitiveWhenPresent<T> empty() {
         @SuppressWarnings("unchecked")
diff --git a/src/main/java/org/mybatis/dynamic/sql/where/condition/IsNotLikeCaseInsensitiveWhenPresent.java b/src/main/java/org/mybatis/dynamic/sql/where/condition/IsNotLikeCaseInsensitiveWhenPresent.java
index df07202f9..880b20ab8 100644
--- a/src/main/java/org/mybatis/dynamic/sql/where/condition/IsNotLikeCaseInsensitiveWhenPresent.java
+++ b/src/main/java/org/mybatis/dynamic/sql/where/condition/IsNotLikeCaseInsensitiveWhenPresent.java
@@ -28,16 +28,16 @@ public class IsNotLikeCaseInsensitiveWhenPresent<T> extends AbstractSingleValueC
         AbstractSingleValueCondition.Mappable<T> {
     private static final IsNotLikeCaseInsensitiveWhenPresent<?> EMPTY =
             new IsNotLikeCaseInsensitiveWhenPresent<>("") { //$NON-NLS-1$
-        @Override
-        public String value() {
-            throw new NoSuchElementException("No value present"); //$NON-NLS-1$
-        }
+                @Override
+                public String value() {
+                    throw new NoSuchElementException("No value present"); //$NON-NLS-1$
+                }
 
-        @Override
-        public boolean isEmpty() {
-            return true;
-        }
-    };
+                @Override
+                public boolean isEmpty() {
+                    return true;
+                }
+            };
 
     public static <T> IsNotLikeCaseInsensitiveWhenPresent<T> empty() {
         @SuppressWarnings("unchecked")