diff --git a/src/main/java/org/apache/commons/jexl3/JexlException.java b/src/main/java/org/apache/commons/jexl3/JexlException.java
index c60b7296d..0c7a85564 100644
--- a/src/main/java/org/apache/commons/jexl3/JexlException.java
+++ b/src/main/java/org/apache/commons/jexl3/JexlException.java
@@ -49,7 +49,6 @@ public class JexlException extends RuntimeException {
     /** Maximum number of characters around exception location. */
     private static final int MAX_EXCHARLOC = 42;
 
-
     /**
      * Creates a new JexlException.
      *
@@ -771,7 +770,6 @@ public Method(final JexlInfo info, final String name, final Object[] args) {
             this(info, name, args, null);
         }
 
-
         /**
          * Creates a new Method exception instance.
          *
@@ -1065,7 +1063,6 @@ public static JexlException tryFailed(final InvocationTargetException xinvoke) {
                 : new JexlException.TryFailed(xinvoke); // fail
     }
 
-
     /**
      * Detailed info message about this error.
      * Format is "debug![begin,end]: string \n msg" where:
diff --git a/src/main/java/org/apache/commons/jexl3/JexlFeatures.java b/src/main/java/org/apache/commons/jexl3/JexlFeatures.java
index 805cdf36c..4cee5a7d1 100644
--- a/src/main/java/org/apache/commons/jexl3/JexlFeatures.java
+++ b/src/main/java/org/apache/commons/jexl3/JexlFeatures.java
@@ -792,7 +792,6 @@ public boolean supportsImportPragma() {
         return getFeature(IMPORT_PRAGMA);
     }
 
-
     /**
      * Sets whether annotation constructs are enabled.
      * <p>
@@ -857,7 +856,6 @@ public JexlFeatures lexical(final boolean flag) {
         return this;
     }
 
-
     /** @return whether lexical scope feature is enabled */
     public boolean isLexical() {
         return getFeature(LEXICAL);
@@ -877,7 +875,6 @@ public JexlFeatures lexicalShade(final boolean flag) {
         return this;
     }
 
-
     /** @return whether lexical shade feature is enabled */
     public boolean isLexicalShade() {
         return getFeature(LEXICAL_SHADE);
diff --git a/src/main/java/org/apache/commons/jexl3/internal/Debugger.java b/src/main/java/org/apache/commons/jexl3/internal/Debugger.java
index 3889e131d..8cbd5a419 100644
--- a/src/main/java/org/apache/commons/jexl3/internal/Debugger.java
+++ b/src/main/java/org/apache/commons/jexl3/internal/Debugger.java
@@ -16,7 +16,6 @@
  */
 package org.apache.commons.jexl3.internal;
 
-
 import java.util.Collections;
 import java.util.Map;
 import java.util.Set;
@@ -435,7 +434,6 @@ protected Object acceptStatement(final JexlNode child, final Object data) {
         return value;
     }
 
-
     /**
      * Checks if a terminal node is the cause to debug &amp; adds its representation to the rebuilt expression.
      * @param node  the child node
@@ -743,7 +741,6 @@ protected Object visit(final ASTBreak node, final Object data) {
         return check(node, "break", data);
     }
 
-
     @Override
     protected Object visit(final ASTForeachStatement node, final Object data) {
         final int form = node.getLoopForm();
diff --git a/src/main/java/org/apache/commons/jexl3/internal/Engine.java b/src/main/java/org/apache/commons/jexl3/internal/Engine.java
index 7153f827c..83e826c35 100644
--- a/src/main/java/org/apache/commons/jexl3/internal/Engine.java
+++ b/src/main/java/org/apache/commons/jexl3/internal/Engine.java
@@ -244,7 +244,6 @@ public Engine(final JexlBuilder conf) {
         }
     }
 
-
     /**
      * Gets the default instance of Uberspect.
      * <p>This is lazily initialized to avoid building a default instance if there
diff --git a/src/main/java/org/apache/commons/jexl3/internal/Engine32.java b/src/main/java/org/apache/commons/jexl3/internal/Engine32.java
index 8391a2e7f..e5c0c4bc0 100644
--- a/src/main/java/org/apache/commons/jexl3/internal/Engine32.java
+++ b/src/main/java/org/apache/commons/jexl3/internal/Engine32.java
@@ -16,7 +16,6 @@
  */
 package org.apache.commons.jexl3.internal;
 
-
 import org.apache.commons.jexl3.JexlBuilder;
 import org.apache.commons.jexl3.JexlContext;
 import org.apache.commons.jexl3.JexlOptions;
diff --git a/src/main/java/org/apache/commons/jexl3/internal/IntegerRange.java b/src/main/java/org/apache/commons/jexl3/internal/IntegerRange.java
index ce826f9c8..10aacb0e8 100644
--- a/src/main/java/org/apache/commons/jexl3/internal/IntegerRange.java
+++ b/src/main/java/org/apache/commons/jexl3/internal/IntegerRange.java
@@ -68,7 +68,6 @@ public int getMax() {
         return max;
     }
 
-
     @Override
     public int hashCode() {
         int hash = getClass().hashCode();
diff --git a/src/main/java/org/apache/commons/jexl3/internal/Interpreter.java b/src/main/java/org/apache/commons/jexl3/internal/Interpreter.java
index 61b5bed81..4c6902736 100644
--- a/src/main/java/org/apache/commons/jexl3/internal/Interpreter.java
+++ b/src/main/java/org/apache/commons/jexl3/internal/Interpreter.java
@@ -2044,7 +2044,6 @@ public class AnnotatedCall implements Callable<Object> {
             data = adata;
         }
 
-
         @Override
         public Object call() throws Exception {
             processed = true;
diff --git a/src/main/java/org/apache/commons/jexl3/internal/InterpreterBase.java b/src/main/java/org/apache/commons/jexl3/internal/InterpreterBase.java
index 967b393c4..b7bd8b6f4 100644
--- a/src/main/java/org/apache/commons/jexl3/internal/InterpreterBase.java
+++ b/src/main/java/org/apache/commons/jexl3/internal/InterpreterBase.java
@@ -16,7 +16,6 @@
  */
 package org.apache.commons.jexl3.internal;
 
-
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
diff --git a/src/main/java/org/apache/commons/jexl3/internal/Scope.java b/src/main/java/org/apache/commons/jexl3/internal/Scope.java
index 6c239248a..bff7d47d4 100644
--- a/src/main/java/org/apache/commons/jexl3/internal/Scope.java
+++ b/src/main/java/org/apache/commons/jexl3/internal/Scope.java
@@ -349,7 +349,6 @@ public String[] getLocalVariables() {
         return locals.toArray(new String[0]);
     }
 
-
     Scope getParent() {
         return parent;
     }
diff --git a/src/main/java/org/apache/commons/jexl3/internal/SoftCache.java b/src/main/java/org/apache/commons/jexl3/internal/SoftCache.java
index 06d459888..145c4a99d 100644
--- a/src/main/java/org/apache/commons/jexl3/internal/SoftCache.java
+++ b/src/main/java/org/apache/commons/jexl3/internal/SoftCache.java
@@ -173,7 +173,3 @@ protected boolean removeEldestEntry(final Map.Entry<K, V> eldest) {
     }
 }
 
-
-
-
-
diff --git a/src/main/java/org/apache/commons/jexl3/internal/TemplateDebugger.java b/src/main/java/org/apache/commons/jexl3/internal/TemplateDebugger.java
index 5c13f98b7..060d0023f 100644
--- a/src/main/java/org/apache/commons/jexl3/internal/TemplateDebugger.java
+++ b/src/main/java/org/apache/commons/jexl3/internal/TemplateDebugger.java
@@ -99,7 +99,6 @@ public boolean debug(final JxltEngine.Template jt) {
         return end > 0;
     }
 
-
     @Override
     protected Object visit(final ASTBlock node, final Object data) {
         // if not really a template, must use super impl
diff --git a/src/main/java/org/apache/commons/jexl3/internal/TemplateEngine.java b/src/main/java/org/apache/commons/jexl3/internal/TemplateEngine.java
index 1504123b7..5d74b16d9 100644
--- a/src/main/java/org/apache/commons/jexl3/internal/TemplateEngine.java
+++ b/src/main/java/org/apache/commons/jexl3/internal/TemplateEngine.java
@@ -126,8 +126,6 @@ int getIndex() {
         }
     }
 
-
-
     /**
      * A helper class to build expressions.
      * Keeps count of sub-expressions by type.
@@ -688,7 +686,6 @@ protected Object evaluate(final Interpreter interpreter) {
         }
     }
 
-
     @Override
     public JxltEngine.Expression createExpression(final JexlInfo jexlInfo, final String expression) {
         final JexlInfo info = jexlInfo == null ?  jexl.createInfo() : jexlInfo;
diff --git a/src/main/java/org/apache/commons/jexl3/internal/introspection/EnumerationIterator.java b/src/main/java/org/apache/commons/jexl3/internal/introspection/EnumerationIterator.java
index d4d1af944..7d5523f56 100644
--- a/src/main/java/org/apache/commons/jexl3/internal/introspection/EnumerationIterator.java
+++ b/src/main/java/org/apache/commons/jexl3/internal/introspection/EnumerationIterator.java
@@ -17,7 +17,6 @@
 
 package org.apache.commons.jexl3.internal.introspection;
 
-
 import java.util.Enumeration;
 import java.util.Iterator;
 
diff --git a/src/main/java/org/apache/commons/jexl3/internal/introspection/IndexedType.java b/src/main/java/org/apache/commons/jexl3/internal/introspection/IndexedType.java
index 617982475..7e67e1fef 100644
--- a/src/main/java/org/apache/commons/jexl3/internal/introspection/IndexedType.java
+++ b/src/main/java/org/apache/commons/jexl3/internal/introspection/IndexedType.java
@@ -17,7 +17,6 @@
 
 package org.apache.commons.jexl3.internal.introspection;
 
-
 import java.beans.IntrospectionException;
 import java.lang.reflect.Method;
 
diff --git a/src/main/java/org/apache/commons/jexl3/internal/introspection/MethodExecutor.java b/src/main/java/org/apache/commons/jexl3/internal/introspection/MethodExecutor.java
index 8ead74a30..b383113fe 100644
--- a/src/main/java/org/apache/commons/jexl3/internal/introspection/MethodExecutor.java
+++ b/src/main/java/org/apache/commons/jexl3/internal/introspection/MethodExecutor.java
@@ -110,7 +110,6 @@ public Object tryInvoke(final String name, final Object obj, final Object... arg
         return JexlEngine.TRY_FAILED;
     }
 
-
     /**
      * Reassembles arguments if the method is a vararg method.
      * @param args The actual arguments being passed to this method
@@ -155,4 +154,3 @@ private Object[] handleVarArg(final Object[] args) {
     }
 }
 
-
diff --git a/src/main/java/org/apache/commons/jexl3/introspection/JexlUberspect.java b/src/main/java/org/apache/commons/jexl3/introspection/JexlUberspect.java
index b91c152d0..172e060c9 100644
--- a/src/main/java/org/apache/commons/jexl3/introspection/JexlUberspect.java
+++ b/src/main/java/org/apache/commons/jexl3/introspection/JexlUberspect.java
@@ -124,7 +124,6 @@ public final JexlPropertySet getPropertySet(final JexlUberspect uber,
             JexlResolver.CONTAINER
     ));
 
-
     /**
      * A resolver types list tailored for Maps, favors '[]' over '.'.
      */
diff --git a/src/main/java/org/apache/commons/jexl3/parser/ASTIdentifierAccess.java b/src/main/java/org/apache/commons/jexl3/parser/ASTIdentifierAccess.java
index 2a35c5a2c..df135d7ab 100644
--- a/src/main/java/org/apache/commons/jexl3/parser/ASTIdentifierAccess.java
+++ b/src/main/java/org/apache/commons/jexl3/parser/ASTIdentifierAccess.java
@@ -16,7 +16,6 @@
  */
 package org.apache.commons.jexl3.parser;
 
-
 /**
  * Identifiers, variables and registers.
  */
diff --git a/src/main/java/org/apache/commons/jexl3/parser/JexlParser.java b/src/main/java/org/apache/commons/jexl3/parser/JexlParser.java
index 5b6f1147a..a5235a53c 100644
--- a/src/main/java/org/apache/commons/jexl3/parser/JexlParser.java
+++ b/src/main/java/org/apache/commons/jexl3/parser/JexlParser.java
@@ -37,7 +37,6 @@
 import org.apache.commons.jexl3.internal.LexicalScope;
 import org.apache.commons.jexl3.internal.Scope;
 
-
 /**
  * The base class for parsing, manages the parameter/local variable frame.
  */
diff --git a/src/main/java/org/apache/commons/jexl3/parser/NumberParser.java b/src/main/java/org/apache/commons/jexl3/parser/NumberParser.java
index ecb972b60..2e6119285 100644
--- a/src/main/java/org/apache/commons/jexl3/parser/NumberParser.java
+++ b/src/main/java/org/apache/commons/jexl3/parser/NumberParser.java
@@ -61,7 +61,6 @@ public String toString() {
         return strb.toString();
     }
 
-
     Class<? extends Number> getLiteralClass() {
         return clazz;
     }
diff --git a/src/main/java/org/apache/commons/jexl3/parser/TokenMgrException.java b/src/main/java/org/apache/commons/jexl3/parser/TokenMgrException.java
index f1cb981a6..34df8a66a 100644
--- a/src/main/java/org/apache/commons/jexl3/parser/TokenMgrException.java
+++ b/src/main/java/org/apache/commons/jexl3/parser/TokenMgrException.java
@@ -92,7 +92,6 @@ public String getMessage() {
                 + "after : " + StringParser.escapeString(after, '"');
     }
 
-
     /** Constructor with message and reason. */
     public TokenMgrException(final String message, final int reason) {
         super(message);
diff --git a/src/main/java/org/apache/commons/jexl3/scripting/JexlScriptEngine.java b/src/main/java/org/apache/commons/jexl3/scripting/JexlScriptEngine.java
index 48d1f390a..d135b032d 100644
--- a/src/main/java/org/apache/commons/jexl3/scripting/JexlScriptEngine.java
+++ b/src/main/java/org/apache/commons/jexl3/scripting/JexlScriptEngine.java
@@ -134,7 +134,6 @@ private static JexlEngine getEngine() {
         return engine;
     }
 
-
     /** The logger. */
     static final Log LOG = LogFactory.getLog(JexlScriptEngine.class);
 
@@ -256,7 +255,6 @@ public Log getLogger() {
         }
     }
 
-
     /**
      * Create a scripting engine using the supplied factory.
      *
diff --git a/src/test/java/org/apache/commons/jexl3/ArithmeticTest.java b/src/test/java/org/apache/commons/jexl3/ArithmeticTest.java
index 7f92e95c2..a2cc36189 100644
--- a/src/test/java/org/apache/commons/jexl3/ArithmeticTest.java
+++ b/src/test/java/org/apache/commons/jexl3/ArithmeticTest.java
@@ -346,7 +346,6 @@ private static int getJavaVersion() {
 
     private final Asserter asserter;
 
-
     private final JexlArithmetic jexla;
 
     private final JexlArithmetic jexlb;
diff --git a/src/test/java/org/apache/commons/jexl3/ArrayAccessTest.java b/src/test/java/org/apache/commons/jexl3/ArrayAccessTest.java
index e4066dea6..879f2b256 100644
--- a/src/test/java/org/apache/commons/jexl3/ArrayAccessTest.java
+++ b/src/test/java/org/apache/commons/jexl3/ArrayAccessTest.java
@@ -25,7 +25,6 @@
 import org.junit.Before;
 import org.junit.Test;
 
-
 /**
  * Tests for array access operator []
  *
@@ -283,7 +282,6 @@ public void testDoubleArrays() throws Exception {
         asserter.assertExpression("foo.'0'.'1' = 'three'", "three");
         asserter.assertExpression("foo.'0'.'1'", "three");
 
-
         foo[0][0] = "one";
         foo[0][1] = "two";
         asserter.assertExpression("foo.0.1", "two");
diff --git a/src/test/java/org/apache/commons/jexl3/CacheTest.java b/src/test/java/org/apache/commons/jexl3/CacheTest.java
index f3618739a..9ab96551a 100644
--- a/src/test/java/org/apache/commons/jexl3/CacheTest.java
+++ b/src/test/java/org/apache/commons/jexl3/CacheTest.java
@@ -278,7 +278,6 @@ public void set(final String p, Object v) {
         }
     }
 
-
     public static class Cached3 extends java.util.TreeMap<String, Object> {
         private static final long serialVersionUID = 1L;
         boolean flag = false;
diff --git a/src/test/java/org/apache/commons/jexl3/CollectionLiteralTest.java b/src/test/java/org/apache/commons/jexl3/CollectionLiteralTest.java
index 88756204f..5342dca8e 100644
--- a/src/test/java/org/apache/commons/jexl3/CollectionLiteralTest.java
+++ b/src/test/java/org/apache/commons/jexl3/CollectionLiteralTest.java
@@ -56,7 +56,6 @@ public Arithmetic363(final boolean strict) {
         }
     }
 
-
     static class CountingArrayBuilder extends ArrayBuilder {
         final AtomicInteger count;
 
diff --git a/src/test/java/org/apache/commons/jexl3/ConcurrentCache.java b/src/test/java/org/apache/commons/jexl3/ConcurrentCache.java
index 6806d87c9..4a3297d34 100644
--- a/src/test/java/org/apache/commons/jexl3/ConcurrentCache.java
+++ b/src/test/java/org/apache/commons/jexl3/ConcurrentCache.java
@@ -46,4 +46,3 @@ protected <K, V> Map<K, V> createMap(final int cacheSize) {
   }
 }
 
-
diff --git a/src/test/java/org/apache/commons/jexl3/DoWhileTest.java b/src/test/java/org/apache/commons/jexl3/DoWhileTest.java
index fed77a65d..c423f375c 100644
--- a/src/test/java/org/apache/commons/jexl3/DoWhileTest.java
+++ b/src/test/java/org/apache/commons/jexl3/DoWhileTest.java
@@ -152,7 +152,6 @@ public void testWhileExecutesExpressionWhenLooping() throws Exception {
         o = e.execute(jc);
         Assert.assertEquals(23, o);
 
-
         jc.set("x", 1);
         e = JEXL.createScript("do x += 1; while (x < 23); return 42;");
         o = e.execute(jc);
diff --git a/src/test/java/org/apache/commons/jexl3/FeaturesTest.java b/src/test/java/org/apache/commons/jexl3/FeaturesTest.java
index b05e655da..7b1675d46 100644
--- a/src/test/java/org/apache/commons/jexl3/FeaturesTest.java
+++ b/src/test/java/org/apache/commons/jexl3/FeaturesTest.java
@@ -279,7 +279,6 @@ public void testNoLocals() throws Exception {
         checkFeature(f, scripts);
     }
 
-
     @Test
     public void testNoLoop() throws Exception {
         final JexlFeatures f = new JexlFeatures().loops(false);
diff --git a/src/test/java/org/apache/commons/jexl3/Foo.java b/src/test/java/org/apache/commons/jexl3/Foo.java
index 9f17f2d86..59278401d 100644
--- a/src/test/java/org/apache/commons/jexl3/Foo.java
+++ b/src/test/java/org/apache/commons/jexl3/Foo.java
@@ -113,7 +113,6 @@ public boolean isSimple()
         return true;
     }
 
-
     public String repeat(final String str) {
         return "Repeat : " + str;
     }
diff --git a/src/test/java/org/apache/commons/jexl3/IfTest.java b/src/test/java/org/apache/commons/jexl3/IfTest.java
index b65ce1f4e..167d7422c 100644
--- a/src/test/java/org/apache/commons/jexl3/IfTest.java
+++ b/src/test/java/org/apache/commons/jexl3/IfTest.java
@@ -317,7 +317,6 @@ public void testTernaryFail() throws Exception {
         }
     }
 
-
     /**
      * Ternary operator condition undefined or null evaluates to false
      * independently of engine flags; same for null coalescing operator.
diff --git a/src/test/java/org/apache/commons/jexl3/Issues100Test.java b/src/test/java/org/apache/commons/jexl3/Issues100Test.java
index 96ab7df91..90fb92223 100644
--- a/src/test/java/org/apache/commons/jexl3/Issues100Test.java
+++ b/src/test/java/org/apache/commons/jexl3/Issues100Test.java
@@ -92,7 +92,6 @@ public Object or(final String lhs, final String rhs) {
         }
     }
 
-
     public static class C192 {
         public static Integer callme(final Integer n) {
             if (n == null) {
diff --git a/src/test/java/org/apache/commons/jexl3/Issues200Test.java b/src/test/java/org/apache/commons/jexl3/Issues200Test.java
index 1478725cc..1e79cec0d 100644
--- a/src/test/java/org/apache/commons/jexl3/Issues200Test.java
+++ b/src/test/java/org/apache/commons/jexl3/Issues200Test.java
@@ -16,7 +16,6 @@
  */
 package org.apache.commons.jexl3;
 
-
 import java.io.StringReader;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -246,12 +245,10 @@ private static void handle(final ExecutorService pool, final JexlScript script,
        pool.submit(() -> script.execute(new MapContext(payload)));
     }
 
-
     public Issues200Test() {
         super("Issues200Test", null);
     }
 
-
     @Before
     @Override
     public void setUp() throws Exception {
@@ -345,7 +342,6 @@ public void test217() throws Exception {
         Assert.assertNull("oob adverted", r);
     }
 
-
     @Test
     public void test221() throws Exception {
         final JexlEvalContext jc = new JexlEvalContext();
@@ -450,7 +446,6 @@ public void test242() throws Exception {
         Assert.assertEquals(Double.doubleToLongBits(e) + " != " + Double.doubleToLongBits(c), a + b, e, 0.0);
     }
 
-
     @Test
     public void test243a() throws Exception {
         final JexlEngine jexl = new JexlBuilder().cache(32).create();
@@ -554,7 +549,6 @@ public void test265() throws Exception {
         Assert.assertEquals(42, result);
     }
 
-
     @Test
     public void test266() throws Exception {
         Object result;
diff --git a/src/test/java/org/apache/commons/jexl3/Issues300Test.java b/src/test/java/org/apache/commons/jexl3/Issues300Test.java
index a6ce39d36..e89e46f1f 100644
--- a/src/test/java/org/apache/commons/jexl3/Issues300Test.java
+++ b/src/test/java/org/apache/commons/jexl3/Issues300Test.java
@@ -207,7 +207,6 @@ <T> T createProxy(final JexlEngine jexl, final Object o, final Class[] clazzz) {
         );
     }
 
-
     private Object run361a(final JexlEngine jexl) {
         final String src = "()-> { ()-> { if (versionFile != null) { return 'foo'; } else { return 'bar'; }} }";
         final JexlScript script = jexl.createScript(src);
@@ -387,7 +386,6 @@ public void test306b() {
         Assert.assertEquals(2, o2);
     }
 
-
     @Test
     public void test306c() {
         final JexlEngine jexl = new JexlBuilder().safe(true).create();
@@ -762,7 +760,6 @@ public void test331() {
         Assert.assertTrue(result.toString().contains("\n"));
     }
 
-
     @Test
     public void test347() {
         final String src = "A.B == 5";
@@ -850,7 +847,6 @@ public void test361b_33() {
         }
     }
 
-
     @Test
     public void test361c_32() {
         final JexlEngine jexl = new Engine32(new JexlBuilder().safe(false).strict(false));
diff --git a/src/test/java/org/apache/commons/jexl3/Issues400Test.java b/src/test/java/org/apache/commons/jexl3/Issues400Test.java
index f151fd35f..c11b28c46 100644
--- a/src/test/java/org/apache/commons/jexl3/Issues400Test.java
+++ b/src/test/java/org/apache/commons/jexl3/Issues400Test.java
@@ -232,7 +232,6 @@ public void test407() {
     Assert.assertEquals(0d, result.doubleValue(), 3.e-32);
   }
 
-
   @Test
   public void test412() {
     final Map<Object, Object> ctl = new HashMap<>();
diff --git a/src/test/java/org/apache/commons/jexl3/JXLTTest.java b/src/test/java/org/apache/commons/jexl3/JXLTTest.java
index bad6feaab..c94d28b98 100644
--- a/src/test/java/org/apache/commons/jexl3/JXLTTest.java
+++ b/src/test/java/org/apache/commons/jexl3/JXLTTest.java
@@ -142,7 +142,6 @@ public static List<JexlBuilder> engines() {
                   new JexlBuilder().silent(false).cache(128).strict(true));
        }
 
-
    private static String refactor(final TemplateDebugger td, final JxltEngine.Template ts) {
     final boolean dbg = td.debug(ts);
     if (dbg) {
diff --git a/src/test/java/org/apache/commons/jexl3/LexicalTest.java b/src/test/java/org/apache/commons/jexl3/LexicalTest.java
index 9403cb225..6a5549a82 100644
--- a/src/test/java/org/apache/commons/jexl3/LexicalTest.java
+++ b/src/test/java/org/apache/commons/jexl3/LexicalTest.java
@@ -872,7 +872,6 @@ public void testLexical6c() {
         Assert.assertEquals(0, o);
     }
 
-
     @Test
     public void testLexical6d() {
         final String str = "i = 0; for (var i : [42]) i; i";
diff --git a/src/test/java/org/apache/commons/jexl3/MethodTest.java b/src/test/java/org/apache/commons/jexl3/MethodTest.java
index abb14d408..919d229b5 100644
--- a/src/test/java/org/apache/commons/jexl3/MethodTest.java
+++ b/src/test/java/org/apache/commons/jexl3/MethodTest.java
@@ -857,5 +857,4 @@ public void testVariousFunctionLocation() throws Exception {
         Assert.assertEquals(42, jexl.createScript("zzzz(4)").execute(zjc));
     }
 
-
 }
diff --git a/src/test/java/org/apache/commons/jexl3/PragmaTest.java b/src/test/java/org/apache/commons/jexl3/PragmaTest.java
index 95ba9068e..2e5351790 100644
--- a/src/test/java/org/apache/commons/jexl3/PragmaTest.java
+++ b/src/test/java/org/apache/commons/jexl3/PragmaTest.java
@@ -240,7 +240,6 @@ public void testImportPragmaValueSet() {
         Assert.assertEquals(src, parsed);
     }
 
-
     @Test
     @SuppressWarnings("AssertEqualsBetweenInconvertibleTypes")
     public void testJxltPragmas() {
diff --git a/src/test/java/org/apache/commons/jexl3/PropertyAccessTest.java b/src/test/java/org/apache/commons/jexl3/PropertyAccessTest.java
index 3af4a09e8..dbf9eecdd 100644
--- a/src/test/java/org/apache/commons/jexl3/PropertyAccessTest.java
+++ b/src/test/java/org/apache/commons/jexl3/PropertyAccessTest.java
@@ -28,7 +28,6 @@
 import org.junit.Before;
 import org.junit.Test;
 
-
 /**
  * Tests for property access operator '.'
  * @since 3.0
@@ -173,7 +172,6 @@ public void setProperty(final String name, final String value) {
         }
     }
 
-
     private Asserter asserter;
 
     public PropertyAccessTest() {
@@ -251,7 +249,6 @@ public void test250() throws Exception {
         }
     }
 
-
     @Test
     public void test275a() throws Exception {
         final JexlEngine jexl = new JexlBuilder().strict(true).safe(false).create();
@@ -318,7 +315,6 @@ public void test275b() throws Exception {
         result = script.execute(ctxt, "stuff");
         Assert.assertEquals(42, result);
 
-
         // unprotected navigation
         script = jexl.createScript("$in.`${p}`.intValue()", "p");
         result = script.execute(ctxt, "fail");
diff --git a/src/test/java/org/apache/commons/jexl3/ScriptTest.java b/src/test/java/org/apache/commons/jexl3/ScriptTest.java
index 509fe2eed..cb324358e 100644
--- a/src/test/java/org/apache/commons/jexl3/ScriptTest.java
+++ b/src/test/java/org/apache/commons/jexl3/ScriptTest.java
@@ -144,7 +144,6 @@ private static String httpPostRequest(final String sURL, final String jsonData)
         return response.toString();
     }
 
-
     /**
      * Create a new test case.
      */
diff --git a/src/test/java/org/apache/commons/jexl3/SideEffectTest.java b/src/test/java/org/apache/commons/jexl3/SideEffectTest.java
index 8c4503ecb..e9f47031f 100644
--- a/src/test/java/org/apache/commons/jexl3/SideEffectTest.java
+++ b/src/test/java/org/apache/commons/jexl3/SideEffectTest.java
@@ -33,7 +33,6 @@
 import org.junit.Before;
 import org.junit.Test;
 
-
 /**
  * Tests for array access operator []
  *
@@ -470,7 +469,6 @@ public void test246b() throws Exception {
         run246(new Arithmetic246b(true));
     }
 
-
     @Test
     public void test248() throws Exception {
         final MapContext ctx = new MapContext();
diff --git a/src/test/java/org/apache/commons/jexl3/SynchronizedArithmetic.java b/src/test/java/org/apache/commons/jexl3/SynchronizedArithmetic.java
index fb65824c3..09b48354a 100644
--- a/src/test/java/org/apache/commons/jexl3/SynchronizedArithmetic.java
+++ b/src/test/java/org/apache/commons/jexl3/SynchronizedArithmetic.java
@@ -117,7 +117,6 @@ protected void monitorEnter(final Object o) {
         }
     }
 
-
     /**
      * An iterator that implements Closeable (at least implements a close method)
      * and uses monitors to protect iteration.
diff --git a/src/test/java/org/apache/commons/jexl3/SynchronizedOverloadsTest.java b/src/test/java/org/apache/commons/jexl3/SynchronizedOverloadsTest.java
index e31fd9dd7..1329c25a0 100644
--- a/src/test/java/org/apache/commons/jexl3/SynchronizedOverloadsTest.java
+++ b/src/test/java/org/apache/commons/jexl3/SynchronizedOverloadsTest.java
@@ -23,7 +23,6 @@
 import org.junit.Before;
 import org.junit.Test;
 
-
 /**
  * Test cases for synchronized calls.
  * <p>May be a base for synchronized calls.
@@ -41,7 +40,6 @@ public void setUp() throws Exception {
         java.util.logging.Logger.getLogger(JexlEngine.class.getName()).setLevel(java.util.logging.Level.SEVERE);
     }
 
-
     @Test
     public void testSynchronized() throws Exception {
         final Map<String, Object> ns = new TreeMap<>();
diff --git a/src/test/java/org/apache/commons/jexl3/VarTest.java b/src/test/java/org/apache/commons/jexl3/VarTest.java
index e420c7f48..fe83e9bd3 100644
--- a/src/test/java/org/apache/commons/jexl3/VarTest.java
+++ b/src/test/java/org/apache/commons/jexl3/VarTest.java
@@ -442,7 +442,6 @@ public void testRefs() throws Exception {
         expect = mkref(new String[][]{{"e"},{"f"}});
         Assert.assertTrue(eq(expect, vars));
 
-
         e = JEXL.createScript("e[f][g]");
         vars = e.getVariables();
         expect = mkref(new String[][]{{"e"},{"f"},{"g"}});
diff --git a/src/test/java/org/apache/commons/jexl3/examples/AbstractOutput.java b/src/test/java/org/apache/commons/jexl3/examples/AbstractOutput.java
index f368a057b..f824296bb 100644
--- a/src/test/java/org/apache/commons/jexl3/examples/AbstractOutput.java
+++ b/src/test/java/org/apache/commons/jexl3/examples/AbstractOutput.java
@@ -51,7 +51,6 @@ private AbstractOutput() {
         // nothing to do
     }
 
-
     /**
      * Outputs the actual and value or checks the actual equals the expected value.
      * @param expr the message to output
diff --git a/src/test/java/org/apache/commons/jexl3/examples/MethodPropertyTest.java b/src/test/java/org/apache/commons/jexl3/examples/MethodPropertyTest.java
index ba4ba70e0..ec3a7970f 100644
--- a/src/test/java/org/apache/commons/jexl3/examples/MethodPropertyTest.java
+++ b/src/test/java/org/apache/commons/jexl3/examples/MethodPropertyTest.java
@@ -115,7 +115,6 @@ public static void example(final AbstractOutput out) throws Exception {
 
     }
 
-
     /**
      * Command line entry point.
      * @param args command line arguments
diff --git a/src/test/java/org/apache/commons/jexl3/internal/introspection/NoJexlTest.java b/src/test/java/org/apache/commons/jexl3/internal/introspection/NoJexlTest.java
index 66a56e54c..7cd868890 100644
--- a/src/test/java/org/apache/commons/jexl3/internal/introspection/NoJexlTest.java
+++ b/src/test/java/org/apache/commons/jexl3/internal/introspection/NoJexlTest.java
@@ -48,7 +48,6 @@ public static class A1 extends A implements InterNoJexl1 {
         @Override public int method() { return 2; }
     }
 
-
     @NoJexl
     public static class A2 extends A  {
         public A2() {}
diff --git a/src/test/java/org/apache/commons/jexl3/internal/introspection/PermissionsTest.java b/src/test/java/org/apache/commons/jexl3/internal/introspection/PermissionsTest.java
index 5d3bf1e24..62e88ec13 100644
--- a/src/test/java/org/apache/commons/jexl3/internal/introspection/PermissionsTest.java
+++ b/src/test/java/org/apache/commons/jexl3/internal/introspection/PermissionsTest.java
@@ -41,14 +41,12 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-
 /**
  * Checks the CacheMap.MethodKey implementation
  */
 
 public class PermissionsTest {
 
-
     public static class A {
         public int i;
         public A() {}
@@ -331,7 +329,6 @@ public void testPermissions0() throws Exception {
         runTestPermissions(permissions0());
     }
 
-
     @Test
     public void testPermissions1() throws Exception {
         runTestPermissions(new JexlPermissions.Delegate(permissions0()) {
diff --git a/src/test/java/org/apache/commons/jexl3/internal/introspection/nojexlpackage/package-info.java b/src/test/java/org/apache/commons/jexl3/internal/introspection/nojexlpackage/package-info.java
index 0c8e112c2..084a1eeda 100644
--- a/src/test/java/org/apache/commons/jexl3/internal/introspection/nojexlpackage/package-info.java
+++ b/src/test/java/org/apache/commons/jexl3/internal/introspection/nojexlpackage/package-info.java
@@ -18,4 +18,3 @@
 package org.apache.commons.jexl3.internal.introspection.nojexlpackage;
 import org.apache.commons.jexl3.annotations.NoJexl;
 
-
diff --git a/src/test/java/org/apache/commons/jexl3/introspection/SandboxTest.java b/src/test/java/org/apache/commons/jexl3/introspection/SandboxTest.java
index 98e0602aa..3a84522fd 100644
--- a/src/test/java/org/apache/commons/jexl3/introspection/SandboxTest.java
+++ b/src/test/java/org/apache/commons/jexl3/introspection/SandboxTest.java
@@ -72,7 +72,6 @@ public MapBuilder mapBuilder(final int size, final boolean extended) {
         }
     }
 
-
     @NoJexl
     public interface CantCallMe {
         void tryMe();
diff --git a/src/test/java/org/apache/commons/jexl3/jexl342/ReferenceGetExecutor.java b/src/test/java/org/apache/commons/jexl3/jexl342/ReferenceGetExecutor.java
index 3cb2f880d..39c1720d0 100644
--- a/src/test/java/org/apache/commons/jexl3/jexl342/ReferenceGetExecutor.java
+++ b/src/test/java/org/apache/commons/jexl3/jexl342/ReferenceGetExecutor.java
@@ -19,7 +19,6 @@
 import org.apache.commons.jexl3.JexlEngine;
 import org.apache.commons.jexl3.introspection.JexlPropertyGet;
 
-
 /**
  * Wraps a reference or optional property get executor.
  */
diff --git a/src/test/java/org/apache/commons/jexl3/jexl342/ReferenceMethodExecutor.java b/src/test/java/org/apache/commons/jexl3/jexl342/ReferenceMethodExecutor.java
index ec4f196fa..5a3dd6745 100644
--- a/src/test/java/org/apache/commons/jexl3/jexl342/ReferenceMethodExecutor.java
+++ b/src/test/java/org/apache/commons/jexl3/jexl342/ReferenceMethodExecutor.java
@@ -20,7 +20,6 @@
 import org.apache.commons.jexl3.JexlException;
 import org.apache.commons.jexl3.introspection.JexlMethod;
 
-
 /**
  * Wraps a reference or optional method executor.
  */
diff --git a/src/test/java/org/apache/commons/jexl3/jexl342/ReferenceSetExecutor.java b/src/test/java/org/apache/commons/jexl3/jexl342/ReferenceSetExecutor.java
index 8ee8d5e15..088a540e8 100644
--- a/src/test/java/org/apache/commons/jexl3/jexl342/ReferenceSetExecutor.java
+++ b/src/test/java/org/apache/commons/jexl3/jexl342/ReferenceSetExecutor.java
@@ -20,7 +20,6 @@
 import org.apache.commons.jexl3.JexlException;
 import org.apache.commons.jexl3.introspection.JexlPropertySet;
 
-
 /**
  * Wraps a reference or optional property set executor.
  */
diff --git a/src/test/java/org/apache/commons/jexl3/jexl342/ReferenceUberspect.java b/src/test/java/org/apache/commons/jexl3/jexl342/ReferenceUberspect.java
index c3d3b5f76..8870822e2 100644
--- a/src/test/java/org/apache/commons/jexl3/jexl342/ReferenceUberspect.java
+++ b/src/test/java/org/apache/commons/jexl3/jexl342/ReferenceUberspect.java
@@ -354,7 +354,6 @@ public List<PropertyResolver> getResolvers(final JexlOperator op, final Object o
         return pojoStrategy;
     }
 
-
     @Override
     public int getVersion() {
         return uberspect.getVersion();
diff --git a/src/test/java/org/apache/commons/jexl3/scripting/JexlScriptEngineTest.java b/src/test/java/org/apache/commons/jexl3/scripting/JexlScriptEngineTest.java
index 825210eec..d9721a7f2 100644
--- a/src/test/java/org/apache/commons/jexl3/scripting/JexlScriptEngineTest.java
+++ b/src/test/java/org/apache/commons/jexl3/scripting/JexlScriptEngineTest.java
@@ -265,7 +265,6 @@ public void testScripting() throws Exception {
         Assert.assertEquals(System.class,engine.eval("JEXL.System"));
     }
 
-
     @Test
     public void testScriptingGetBy() throws Exception {
         final ScriptEngineManager manager = new ScriptEngineManager();