From d0cffe75002501d44d720a895b43aa9d5e55a741 Mon Sep 17 00:00:00 2001
From: Mike Cifelli <michael.cifelli@gmail.com>
Date: Sat, 17 Mar 2018 09:52:53 -0400
Subject: [PATCH] Update code formatter

---
 .idea/codeStyles/Project.xml                  | 39 +++++++++++++++++++
 src/main/application/LispMain.java            |  1 -
 src/main/environment/RuntimeEnvironment.java  |  1 -
 .../error/CriticalLineColumnException.java    |  1 -
 src/main/error/CriticalLispException.java     |  1 -
 src/main/error/ErrorManager.java              |  4 --
 src/main/error/LineColumnException.java       |  1 -
 src/main/error/LispException.java             |  1 -
 src/main/error/LispWarning.java               |  1 -
 src/main/file/FilePosition.java               |  1 -
 src/main/file/FilePositionTracker.java        |  1 -
 src/main/function/ArgumentValidator.java      |  1 -
 src/main/function/FunctionNames.java          |  1 -
 src/main/function/LispFunction.java           |  1 -
 src/main/function/LispSpecialFunction.java    |  1 -
 src/main/function/UserDefinedFunction.java    |  1 -
 src/main/function/UserDefinedMacro.java       |  1 -
 .../function/UserDefinedSpecialFunction.java  |  1 -
 src/main/function/builtin/APPLY.java          |  1 -
 .../function/builtin/BackquoteEvaluator.java  |  1 -
 src/main/function/builtin/EVAL.java           |  1 -
 src/main/function/builtin/EXIT.java           |  1 -
 src/main/function/builtin/FUNCALL.java        |  1 -
 src/main/function/builtin/FUSE.java           |  1 -
 src/main/function/builtin/GENSYM.java         |  1 -
 src/main/function/builtin/LOAD.java           |  1 -
 src/main/function/builtin/PRINT.java          |  1 -
 src/main/function/builtin/SET.java            |  1 -
 src/main/function/builtin/SYMBOLS.java        |  1 -
 .../function/builtin/SYMBOL_FUNCTION.java     |  1 -
 src/main/function/builtin/cons/CONS.java      |  1 -
 src/main/function/builtin/cons/FIRST.java     |  1 -
 src/main/function/builtin/cons/LENGTH.java    |  1 -
 src/main/function/builtin/cons/LIST.java      |  1 -
 src/main/function/builtin/cons/REST.java      |  1 -
 src/main/function/builtin/math/DIVIDE.java    |  1 -
 src/main/function/builtin/math/MINUS.java     |  1 -
 src/main/function/builtin/math/MODULO.java    |  1 -
 src/main/function/builtin/math/MULTIPLY.java  |  1 -
 .../function/builtin/math/MathFunction.java   |  1 -
 src/main/function/builtin/math/PLUS.java      |  1 -
 src/main/function/builtin/math/REMAINDER.java |  1 -
 src/main/function/builtin/predicate/ATOM.java |  1 -
 src/main/function/builtin/predicate/EQ.java   |  1 -
 .../function/builtin/predicate/EQUAL.java     |  1 -
 .../builtin/predicate/GENSYM_EQUAL.java       |  1 -
 .../function/builtin/predicate/LISTP.java     |  1 -
 src/main/function/builtin/predicate/NULL.java |  1 -
 .../builtin/predicate/NUMERIC_EQUAL.java      |  1 -
 .../builtin/predicate/NUMERIC_GREATER.java    |  1 -
 .../builtin/predicate/NUMERIC_LESS.java       |  1 -
 src/main/function/builtin/special/AND.java    |  1 -
 src/main/function/builtin/special/CASE.java   |  1 -
 src/main/function/builtin/special/COND.java   |  1 -
 .../builtin/special/DEFINE_SPECIAL.java       |  1 -
 .../function/builtin/special/DEFMACRO.java    |  1 -
 src/main/function/builtin/special/DEFUN.java  |  1 -
 src/main/function/builtin/special/Define.java |  1 -
 src/main/function/builtin/special/IF.java     |  1 -
 src/main/function/builtin/special/LAMBDA.java |  1 -
 src/main/function/builtin/special/LET.java    |  1 -
 .../function/builtin/special/LET_STAR.java    |  1 -
 src/main/function/builtin/special/OR.java     |  1 -
 src/main/function/builtin/special/PROGN.java  |  1 -
 src/main/function/builtin/special/QUOTE.java  |  1 -
 src/main/function/builtin/special/RECUR.java  |  1 -
 src/main/function/builtin/special/SETQ.java   |  1 -
 src/main/interpreter/FileLispInterpreter.java |  1 -
 .../InteractiveLispInterpreter.java           |  1 -
 src/main/interpreter/LispInterpreter.java     |  1 -
 .../interpreter/LispInterpreterBuilder.java   |  1 -
 .../LispInterpreterBuilderImpl.java           |  4 --
 src/main/parser/LispParser.java               |  1 -
 src/main/recursion/TailCall.java              |  1 -
 src/main/recursion/TailCalls.java             |  1 -
 .../LispCommentRemovingInputStream.java       |  1 -
 src/main/scanner/LispInputStream.java         |  1 -
 src/main/scanner/LispScanner.java             |  1 -
 src/main/sexpression/AtSignExpression.java    |  1 -
 src/main/sexpression/Atom.java                |  1 -
 src/main/sexpression/BackquoteExpression.java |  1 -
 src/main/sexpression/CommaExpression.java     |  1 -
 src/main/sexpression/Cons.java                |  1 -
 src/main/sexpression/DisplayName.java         |  1 -
 src/main/sexpression/LambdaExpression.java    |  1 -
 src/main/sexpression/LispNumber.java          |  1 -
 src/main/sexpression/LispString.java          |  1 -
 src/main/sexpression/Nil.java                 |  1 -
 src/main/sexpression/SExpression.java         |  1 -
 src/main/sexpression/Symbol.java              |  1 -
 src/main/stream/SafeInputStream.java          |  1 -
 src/main/stream/SafeOutputStream.java         |  1 -
 src/main/stream/UncheckedIOException.java     |  1 -
 src/main/table/FunctionTable.java             |  1 -
 src/main/table/SymbolTable.java               |  1 -
 src/main/terminal/ControlSequenceHandler.java |  1 -
 src/main/terminal/ControlSequenceLookup.java  |  1 -
 src/main/terminal/LispTerminal.java           |  7 ++--
 src/main/terminal/SelectGraphicRendition.java |  5 ---
 src/main/terminal/TerminalConfiguration.java  |  1 -
 src/main/terminal/TerminalHistory.java        |  1 -
 src/main/token/AtSign.java                    |  1 -
 src/main/token/Backquote.java                 |  1 -
 src/main/token/Comma.java                     |  1 -
 src/main/token/Eof.java                       |  1 -
 src/main/token/Identifier.java                |  1 -
 src/main/token/LeftParenthesis.java           |  1 -
 src/main/token/Number.java                    |  1 -
 src/main/token/QuoteMark.java                 |  1 -
 src/main/token/QuotedString.java              |  1 -
 src/main/token/RightParenthesis.java          |  1 -
 src/main/token/Token.java                     |  1 -
 src/main/token/TokenFactory.java              |  1 -
 src/main/token/TokenFactoryImpl.java          | 39 +++++++++----------
 src/main/util/Characters.java                 |  1 -
 src/main/util/Path.java                       |  1 -
 .../fixture/LispInterpreterFixture.java       |  1 -
 src/test/application/MainTest.java            |  5 +--
 .../environment/RuntimeEnvironmentTest.java   | 22 +++++++----
 src/test/error/ErrorManagerTest.java          |  1 -
 src/test/file/FilePositionTrackerTest.java    |  1 -
 src/test/function/ArgumentValidatorTest.java  |  1 -
 src/test/function/LispFunctionTest.java       |  1 -
 .../function/LispSpecialFunctionTest.java     |  1 -
 .../function/UserDefinedFunctionTest.java     |  1 -
 .../builtin/BackquoteEvaluatorTest.java       |  7 ++--
 src/test/function/builtin/EVALTest.java       | 16 +++++---
 src/test/function/builtin/EXITTest.java       |  1 -
 src/test/function/builtin/FUNCALLTest.java    |  1 -
 src/test/function/builtin/GENSYMTest.java     |  1 -
 src/test/function/builtin/LOADTest.java       |  1 -
 src/test/function/builtin/PRINTTest.java      |  1 -
 src/test/function/builtin/SETTest.java        |  1 -
 .../function/builtin/SYMBOL_FUNCTIONTest.java |  1 -
 src/test/function/builtin/cons/CONSTest.java  |  1 -
 src/test/function/builtin/cons/FIRSTTest.java |  1 -
 .../function/builtin/cons/LENGTHTest.java     |  1 -
 src/test/function/builtin/cons/LISTTest.java  |  1 -
 src/test/function/builtin/cons/RESTTest.java  |  1 -
 .../function/builtin/math/DIVIDETest.java     |  1 -
 src/test/function/builtin/math/MINUSTest.java |  1 -
 .../function/builtin/math/MULTIPLYTest.java   |  1 -
 src/test/function/builtin/math/PLUSTest.java  |  1 -
 .../function/builtin/predicate/ATOMTest.java  |  1 -
 .../function/builtin/predicate/EQTest.java    |  1 -
 .../function/builtin/predicate/EQUALTest.java |  1 -
 .../builtin/predicate/GENSYM_EQUALTest.java   |  1 -
 .../function/builtin/predicate/LISTPTest.java |  1 -
 .../function/builtin/predicate/NULLTest.java  |  1 -
 .../builtin/predicate/NUMERIC_EQUALTest.java  |  1 -
 .../predicate/NUMERIC_GREATERTest.java        |  1 -
 .../builtin/predicate/NUMERIC_LESSTest.java   |  1 -
 .../function/builtin/special/ANDTest.java     |  1 -
 .../function/builtin/special/CASETest.java    |  1 -
 .../function/builtin/special/CONDTest.java    |  1 -
 .../builtin/special/DEFINE_SPECIALTest.java   |  1 -
 .../builtin/special/DEFMACROTest.java         |  1 -
 .../function/builtin/special/DEFUNTest.java   |  1 -
 src/test/function/builtin/special/IFTest.java |  1 -
 .../function/builtin/special/LAMBDATest.java  |  1 -
 .../function/builtin/special/LETTest.java     |  1 -
 .../builtin/special/LET_STARTest.java         |  1 -
 src/test/function/builtin/special/ORTest.java |  1 -
 .../function/builtin/special/PROGNTest.java   |  1 -
 .../function/builtin/special/QUOTETest.java   |  1 -
 .../function/builtin/special/RECURTest.java   | 10 +++--
 .../function/builtin/special/SETQTest.java    |  1 -
 src/test/interpreter/LispInterpreterTest.java |  1 -
 src/test/parser/LispParserTest.java           |  4 +-
 src/test/recursion/TailCallTest.java          |  1 -
 .../LispCommentRemovingInputStreamTest.java   |  1 -
 .../scanner/LispScannerLineColumnTest.java    |  1 -
 src/test/scanner/LispScannerTextTest.java     |  1 -
 src/test/scanner/LispScannerTypeTest.java     |  1 -
 src/test/sexpression/SExpressionTest.java     |  1 -
 src/test/stream/SafeInputStreamTest.java      |  1 -
 src/test/stream/SafeOutputStreamTest.java     |  1 -
 src/test/table/ExecutionContextTest.java      |  1 -
 src/test/table/FunctionTableTest.java         |  1 -
 src/test/table/SymbolTableTest.java           |  1 -
 .../terminal/ControlSequenceHandlerTest.java  |  1 -
 src/test/terminal/ControlSequenceTest.java    |  1 -
 src/test/terminal/FlushListener.java          |  1 -
 src/test/terminal/LispTerminalTest.java       |  1 -
 .../terminal/TerminalConfigurationTest.java   |  1 -
 src/test/terminal/TerminalHistoryTest.java    |  1 -
 .../terminal/VirtualTerminalInteractor.java   | 13 ++++---
 .../testutil/SymbolAndFunctionCleaner.java    |  1 -
 src/test/testutil/TestUtilities.java          |  1 -
 src/test/testutil/TypeAssertions.java         |  1 -
 src/test/token/TokenFactoryTest.java          |  1 -
 src/test/util/CharactersTest.java             |  1 -
 src/test/util/PathTest.java                   |  1 -
 193 files changed, 108 insertions(+), 247 deletions(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 431b78d..63e4c92 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,8 +1,47 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
+    <JavaCodeStyleSettings>
+      <option name="DO_NOT_WRAP_AFTER_SINGLE_ANNOTATION" value="true" />
+      <option name="ANNOTATION_PARAMETER_WRAP" value="5" />
+      <option name="ALIGN_MULTILINE_ANNOTATION_PARAMETERS" value="true" />
+    </JavaCodeStyleSettings>
     <XML>
       <option name="XML_SPACE_INSIDE_EMPTY_TAG" value="true" />
     </XML>
+    <codeStyleSettings language="JAVA">
+      <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
+      <option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
+      <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
+      <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="0" />
+      <option name="BLANK_LINES_AFTER_CLASS_HEADER" value="1" />
+      <option name="ELSE_ON_NEW_LINE" value="true" />
+      <option name="ALIGN_MULTILINE_CHAINED_METHODS" value="true" />
+      <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
+      <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
+      <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
+      <option name="ALIGN_MULTILINE_EXTENDS_LIST" value="true" />
+      <option name="ALIGN_MULTILINE_ARRAY_INITIALIZER_EXPRESSION" value="true" />
+      <option name="SPACE_WITHIN_ARRAY_INITIALIZER_BRACES" value="true" />
+      <option name="SPACE_BEFORE_ARRAY_INITIALIZER_LBRACE" value="true" />
+      <option name="CALL_PARAMETERS_WRAP" value="5" />
+      <option name="METHOD_PARAMETERS_WRAP" value="5" />
+      <option name="RESOURCE_LIST_WRAP" value="5" />
+      <option name="EXTENDS_LIST_WRAP" value="5" />
+      <option name="THROWS_LIST_WRAP" value="5" />
+      <option name="EXTENDS_KEYWORD_WRAP" value="1" />
+      <option name="THROWS_KEYWORD_WRAP" value="1" />
+      <option name="METHOD_CALL_CHAIN_WRAP" value="5" />
+      <option name="BINARY_OPERATION_WRAP" value="5" />
+      <option name="TERNARY_OPERATION_WRAP" value="1" />
+      <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
+      <option name="KEEP_SIMPLE_METHODS_IN_ONE_LINE" value="true" />
+      <option name="KEEP_SIMPLE_LAMBDAS_IN_ONE_LINE" value="true" />
+      <option name="KEEP_SIMPLE_CLASSES_IN_ONE_LINE" value="true" />
+      <option name="FOR_STATEMENT_WRAP" value="5" />
+      <option name="ARRAY_INITIALIZER_WRAP" value="5" />
+      <option name="ASSIGNMENT_WRAP" value="1" />
+      <option name="ENUM_CONSTANTS_WRAP" value="5" />
+    </codeStyleSettings>
     <codeStyleSettings language="XML">
       <indentOptions>
         <option name="INDENT_SIZE" value="2" />
diff --git a/src/main/application/LispMain.java b/src/main/application/LispMain.java
index 91d8837..16640e5 100644
--- a/src/main/application/LispMain.java
+++ b/src/main/application/LispMain.java
@@ -152,5 +152,4 @@ public class LispMain {
 
         return builder.build();
     }
-
 }
diff --git a/src/main/environment/RuntimeEnvironment.java b/src/main/environment/RuntimeEnvironment.java
index a0d993e..ce0a2aa 100644
--- a/src/main/environment/RuntimeEnvironment.java
+++ b/src/main/environment/RuntimeEnvironment.java
@@ -151,5 +151,4 @@ public class RuntimeEnvironment {
     public String decorateCriticalOutput(String criticalOutput) {
         return criticalOutputDecorator.apply(criticalOutput);
     }
-
 }
diff --git a/src/main/error/CriticalLineColumnException.java b/src/main/error/CriticalLineColumnException.java
index a8c2cc5..7cd9cbb 100644
--- a/src/main/error/CriticalLineColumnException.java
+++ b/src/main/error/CriticalLineColumnException.java
@@ -17,5 +17,4 @@ public abstract class CriticalLineColumnException extends LineColumnException {
     public Severity getSeverity() {
         return CRITICAL;
     }
-
 }
\ No newline at end of file
diff --git a/src/main/error/CriticalLispException.java b/src/main/error/CriticalLispException.java
index b0bb04b..0c06a03 100644
--- a/src/main/error/CriticalLispException.java
+++ b/src/main/error/CriticalLispException.java
@@ -12,5 +12,4 @@ public abstract class CriticalLispException extends LispException {
     public Severity getSeverity() {
         return CRITICAL;
     }
-
 }
diff --git a/src/main/error/ErrorManager.java b/src/main/error/ErrorManager.java
index f4f49ff..9bf41e2 100644
--- a/src/main/error/ErrorManager.java
+++ b/src/main/error/ErrorManager.java
@@ -53,7 +53,6 @@ public class ErrorManager {
     public static enum Severity {
 
         WARNING {
-
             @Override
             public String decorate(String warningOutput, RuntimeEnvironment environment) {
                 return environment.decorateWarningOutput(warningOutput);
@@ -66,7 +65,6 @@ public class ErrorManager {
         },
 
         ERROR {
-
             @Override
             public String decorate(String errorOutput, RuntimeEnvironment environment) {
                 return environment.decorateErrorOutput(errorOutput);
@@ -79,7 +77,6 @@ public class ErrorManager {
         },
 
         CRITICAL {
-
             @Override
             public String decorate(String criticalOutput, RuntimeEnvironment environment) {
                 return environment.decorateCriticalOutput(criticalOutput);
@@ -95,5 +92,4 @@ public class ErrorManager {
 
         public abstract String toDisplayString();
     }
-
 }
diff --git a/src/main/error/LineColumnException.java b/src/main/error/LineColumnException.java
index 6da696a..a559d9e 100644
--- a/src/main/error/LineColumnException.java
+++ b/src/main/error/LineColumnException.java
@@ -22,5 +22,4 @@ public abstract class LineColumnException extends LispException {
     }
 
     public abstract String getMessagePrefix();
-
 }
\ No newline at end of file
diff --git a/src/main/error/LispException.java b/src/main/error/LispException.java
index 32eb330..7d09171 100644
--- a/src/main/error/LispException.java
+++ b/src/main/error/LispException.java
@@ -11,5 +11,4 @@ public abstract class LispException extends RuntimeException {
     public Severity getSeverity() {
         return ERROR;
     }
-
 }
diff --git a/src/main/error/LispWarning.java b/src/main/error/LispWarning.java
index a6351dc..7670a53 100644
--- a/src/main/error/LispWarning.java
+++ b/src/main/error/LispWarning.java
@@ -12,5 +12,4 @@ public abstract class LispWarning extends LispException {
     public Severity getSeverity() {
         return WARNING;
     }
-
 }
diff --git a/src/main/file/FilePosition.java b/src/main/file/FilePosition.java
index e65837b..83cf0e1 100644
--- a/src/main/file/FilePosition.java
+++ b/src/main/file/FilePosition.java
@@ -29,5 +29,4 @@ public class FilePosition {
     public void setColumnNumber(int columnNumber) {
         this.columnNumber = columnNumber;
     }
-
 }
\ No newline at end of file
diff --git a/src/main/file/FilePositionTracker.java b/src/main/file/FilePositionTracker.java
index 6b8074b..bf6c33e 100644
--- a/src/main/file/FilePositionTracker.java
+++ b/src/main/file/FilePositionTracker.java
@@ -28,5 +28,4 @@ public class FilePositionTracker {
         lineNumber++;
         columnNumber = 0;
     }
-
 }
\ No newline at end of file
diff --git a/src/main/function/ArgumentValidator.java b/src/main/function/ArgumentValidator.java
index 9752f8b..e0492f8 100644
--- a/src/main/function/ArgumentValidator.java
+++ b/src/main/function/ArgumentValidator.java
@@ -231,5 +231,4 @@ public class ArgumentValidator {
             return (displayName == null) ? "unknown" : displayName.value();
         }
     }
-
 }
diff --git a/src/main/function/FunctionNames.java b/src/main/function/FunctionNames.java
index 45e173c..5e8005b 100644
--- a/src/main/function/FunctionNames.java
+++ b/src/main/function/FunctionNames.java
@@ -10,5 +10,4 @@ import java.lang.annotation.Target;
 public @interface FunctionNames {
 
     String[] value();
-
 }
diff --git a/src/main/function/LispFunction.java b/src/main/function/LispFunction.java
index 6b6704e..bd2c48b 100644
--- a/src/main/function/LispFunction.java
+++ b/src/main/function/LispFunction.java
@@ -14,5 +14,4 @@ public abstract class LispFunction {
     public boolean isMacro() {
         return false;
     }
-
 }
diff --git a/src/main/function/LispSpecialFunction.java b/src/main/function/LispSpecialFunction.java
index c99941a..3b8953d 100644
--- a/src/main/function/LispSpecialFunction.java
+++ b/src/main/function/LispSpecialFunction.java
@@ -6,5 +6,4 @@ public abstract class LispSpecialFunction extends LispFunction {
     public boolean isArgumentListEvaluated() {
         return false;
     }
-
 }
diff --git a/src/main/function/UserDefinedFunction.java b/src/main/function/UserDefinedFunction.java
index 019fddb..64bbb72 100644
--- a/src/main/function/UserDefinedFunction.java
+++ b/src/main/function/UserDefinedFunction.java
@@ -166,5 +166,4 @@ public class UserDefinedFunction extends LispFunction {
                           parameters);
         }
     }
-
 }
diff --git a/src/main/function/UserDefinedMacro.java b/src/main/function/UserDefinedMacro.java
index b59b67d..02f0baf 100644
--- a/src/main/function/UserDefinedMacro.java
+++ b/src/main/function/UserDefinedMacro.java
@@ -12,5 +12,4 @@ public class UserDefinedMacro extends UserDefinedSpecialFunction {
     public boolean isMacro() {
         return true;
     }
-
 }
diff --git a/src/main/function/UserDefinedSpecialFunction.java b/src/main/function/UserDefinedSpecialFunction.java
index 4ce4010..848c398 100644
--- a/src/main/function/UserDefinedSpecialFunction.java
+++ b/src/main/function/UserDefinedSpecialFunction.java
@@ -12,5 +12,4 @@ public class UserDefinedSpecialFunction extends UserDefinedFunction {
     public boolean isArgumentListEvaluated() {
         return false;
     }
-
 }
diff --git a/src/main/function/builtin/APPLY.java b/src/main/function/builtin/APPLY.java
index 3fd6002..3dbeb62 100644
--- a/src/main/function/builtin/APPLY.java
+++ b/src/main/function/builtin/APPLY.java
@@ -36,5 +36,4 @@ public class APPLY extends LispFunction {
 
         return applyFunction(function, functionArguments);
     }
-
 }
diff --git a/src/main/function/builtin/BackquoteEvaluator.java b/src/main/function/builtin/BackquoteEvaluator.java
index 4ea1eba..67a7b86 100644
--- a/src/main/function/builtin/BackquoteEvaluator.java
+++ b/src/main/function/builtin/BackquoteEvaluator.java
@@ -201,5 +201,4 @@ class BackquoteEvaluator {
             return "at sign did not evaluate to a list";
         }
     }
-
 }
diff --git a/src/main/function/builtin/EVAL.java b/src/main/function/builtin/EVAL.java
index d351753..efbe839 100644
--- a/src/main/function/builtin/EVAL.java
+++ b/src/main/function/builtin/EVAL.java
@@ -228,5 +228,4 @@ public class EVAL extends LispFunction {
             return "unmatched at sign";
         }
     }
-
 }
diff --git a/src/main/function/builtin/EXIT.java b/src/main/function/builtin/EXIT.java
index a46be6c..aabda51 100644
--- a/src/main/function/builtin/EXIT.java
+++ b/src/main/function/builtin/EXIT.java
@@ -28,5 +28,4 @@ public class EXIT extends LispFunction {
 
         return NIL;
     }
-
 }
diff --git a/src/main/function/builtin/FUNCALL.java b/src/main/function/builtin/FUNCALL.java
index 9db896f..30e6685 100644
--- a/src/main/function/builtin/FUNCALL.java
+++ b/src/main/function/builtin/FUNCALL.java
@@ -26,5 +26,4 @@ public class FUNCALL extends LispFunction {
 
         return apply(applyArgs);
     }
-
 }
diff --git a/src/main/function/builtin/FUSE.java b/src/main/function/builtin/FUSE.java
index 30731c2..c662551 100644
--- a/src/main/function/builtin/FUSE.java
+++ b/src/main/function/builtin/FUSE.java
@@ -32,5 +32,4 @@ public class FUSE extends LispFunction {
 
         return new Symbol(left.toString() + SEPARATOR + right.toString());
     }
-
 }
diff --git a/src/main/function/builtin/GENSYM.java b/src/main/function/builtin/GENSYM.java
index d4e21ab..7708426 100644
--- a/src/main/function/builtin/GENSYM.java
+++ b/src/main/function/builtin/GENSYM.java
@@ -39,5 +39,4 @@ public class GENSYM extends LispFunction {
 
         return generateSymbol();
     }
-
 }
diff --git a/src/main/function/builtin/LOAD.java b/src/main/function/builtin/LOAD.java
index 6ec3903..29993db 100644
--- a/src/main/function/builtin/LOAD.java
+++ b/src/main/function/builtin/LOAD.java
@@ -114,5 +114,4 @@ public class LOAD extends LispFunction {
             return format("could not load ''{0}''", fileName);
         }
     }
-
 }
diff --git a/src/main/function/builtin/PRINT.java b/src/main/function/builtin/PRINT.java
index 7f2a1e6..c7a77d4 100644
--- a/src/main/function/builtin/PRINT.java
+++ b/src/main/function/builtin/PRINT.java
@@ -27,5 +27,4 @@ public class PRINT extends LispFunction {
 
         return argument;
     }
-
 }
diff --git a/src/main/function/builtin/SET.java b/src/main/function/builtin/SET.java
index d160d7e..0d3e90b 100644
--- a/src/main/function/builtin/SET.java
+++ b/src/main/function/builtin/SET.java
@@ -54,5 +54,4 @@ public class SET extends LispFunction {
     private boolean isSymbolInTable(SExpression symbol, SymbolTable table) {
         return table.contains(symbol.toString());
     }
-
 }
diff --git a/src/main/function/builtin/SYMBOLS.java b/src/main/function/builtin/SYMBOLS.java
index 38b91be..e1058a6 100644
--- a/src/main/function/builtin/SYMBOLS.java
+++ b/src/main/function/builtin/SYMBOLS.java
@@ -25,5 +25,4 @@ public class SYMBOLS extends LispFunction {
 
         return executionContext.toList();
     }
-
 }
diff --git a/src/main/function/builtin/SYMBOL_FUNCTION.java b/src/main/function/builtin/SYMBOL_FUNCTION.java
index 95cb2aa..022c211 100644
--- a/src/main/function/builtin/SYMBOL_FUNCTION.java
+++ b/src/main/function/builtin/SYMBOL_FUNCTION.java
@@ -60,5 +60,4 @@ public class SYMBOL_FUNCTION extends LispFunction {
             return format("SYMBOL-FUNCTION: undefined function: {0}", function);
         }
     }
-
 }
diff --git a/src/main/function/builtin/cons/CONS.java b/src/main/function/builtin/cons/CONS.java
index 6b0dc6e..3fcb453 100644
--- a/src/main/function/builtin/cons/CONS.java
+++ b/src/main/function/builtin/cons/CONS.java
@@ -26,5 +26,4 @@ public class CONS extends LispFunction {
 
         return new Cons(firstArgument, secondArgument);
     }
-
 }
diff --git a/src/main/function/builtin/cons/FIRST.java b/src/main/function/builtin/cons/FIRST.java
index 83f9fd4..f973ae5 100644
--- a/src/main/function/builtin/cons/FIRST.java
+++ b/src/main/function/builtin/cons/FIRST.java
@@ -24,5 +24,4 @@ public class FIRST extends LispFunction {
 
         return argument.getFirst();
     }
-
 }
diff --git a/src/main/function/builtin/cons/LENGTH.java b/src/main/function/builtin/cons/LENGTH.java
index 1046467..9a1088a 100644
--- a/src/main/function/builtin/cons/LENGTH.java
+++ b/src/main/function/builtin/cons/LENGTH.java
@@ -62,5 +62,4 @@ public class LENGTH extends LispFunction {
     private BigInteger increment(BigInteger number) {
         return number.add(BigInteger.ONE);
     }
-
 }
diff --git a/src/main/function/builtin/cons/LIST.java b/src/main/function/builtin/cons/LIST.java
index a83271d..f45d4f3 100644
--- a/src/main/function/builtin/cons/LIST.java
+++ b/src/main/function/builtin/cons/LIST.java
@@ -27,5 +27,4 @@ public class LIST extends LispFunction {
 
         return argumentList;
     }
-
 }
diff --git a/src/main/function/builtin/cons/REST.java b/src/main/function/builtin/cons/REST.java
index 77eb943..e8e1142 100644
--- a/src/main/function/builtin/cons/REST.java
+++ b/src/main/function/builtin/cons/REST.java
@@ -24,5 +24,4 @@ public class REST extends LispFunction {
 
         return argument.getRest();
     }
-
 }
diff --git a/src/main/function/builtin/math/DIVIDE.java b/src/main/function/builtin/math/DIVIDE.java
index bee44d9..ea1bbf2 100644
--- a/src/main/function/builtin/math/DIVIDE.java
+++ b/src/main/function/builtin/math/DIVIDE.java
@@ -50,5 +50,4 @@ public class DIVIDE extends LispFunction {
             return "divide by zero";
         }
     }
-
 }
diff --git a/src/main/function/builtin/math/MINUS.java b/src/main/function/builtin/math/MINUS.java
index 56d725e..c1c5270 100644
--- a/src/main/function/builtin/math/MINUS.java
+++ b/src/main/function/builtin/math/MINUS.java
@@ -35,5 +35,4 @@ public class MINUS extends LispFunction {
     private LispNumber subtract(LispNumber number1, LispNumber number2) {
         return new LispNumber(number1.getValue().subtract(number2.getValue()));
     }
-
 }
diff --git a/src/main/function/builtin/math/MODULO.java b/src/main/function/builtin/math/MODULO.java
index b092b96..e612b70 100644
--- a/src/main/function/builtin/math/MODULO.java
+++ b/src/main/function/builtin/math/MODULO.java
@@ -41,5 +41,4 @@ public class MODULO extends LispFunction {
             return "modulus not positive";
         }
     }
-
 }
diff --git a/src/main/function/builtin/math/MULTIPLY.java b/src/main/function/builtin/math/MULTIPLY.java
index cbbe45b..f61018a 100644
--- a/src/main/function/builtin/math/MULTIPLY.java
+++ b/src/main/function/builtin/math/MULTIPLY.java
@@ -30,5 +30,4 @@ public class MULTIPLY extends LispFunction {
     private LispNumber multiply(LispNumber number1, LispNumber number2) {
         return new LispNumber(number1.getValue().multiply(number2.getValue()));
     }
-
 }
diff --git a/src/main/function/builtin/math/MathFunction.java b/src/main/function/builtin/math/MathFunction.java
index ec3520a..2cbc075 100644
--- a/src/main/function/builtin/math/MathFunction.java
+++ b/src/main/function/builtin/math/MathFunction.java
@@ -40,5 +40,4 @@ class MathFunction {
 
         return tailCall(() -> callTailRecursive(new Cons(operationResult, remainingNumbers)));
     }
-
 }
diff --git a/src/main/function/builtin/math/PLUS.java b/src/main/function/builtin/math/PLUS.java
index 16677b5..2dd3e3c 100644
--- a/src/main/function/builtin/math/PLUS.java
+++ b/src/main/function/builtin/math/PLUS.java
@@ -30,5 +30,4 @@ public class PLUS extends LispFunction {
     private LispNumber add(LispNumber number1, LispNumber number2) {
         return new LispNumber(number1.getValue().add(number2.getValue()));
     }
-
 }
diff --git a/src/main/function/builtin/math/REMAINDER.java b/src/main/function/builtin/math/REMAINDER.java
index ede2d17..f1a367c 100644
--- a/src/main/function/builtin/math/REMAINDER.java
+++ b/src/main/function/builtin/math/REMAINDER.java
@@ -31,5 +31,4 @@ public class REMAINDER extends LispFunction {
             throw new DivideByZeroException();
         }
     }
-
 }
diff --git a/src/main/function/builtin/predicate/ATOM.java b/src/main/function/builtin/predicate/ATOM.java
index 7c0f604..11259a3 100644
--- a/src/main/function/builtin/predicate/ATOM.java
+++ b/src/main/function/builtin/predicate/ATOM.java
@@ -26,5 +26,4 @@ public class ATOM extends LispFunction {
 
         return argument.isAtom() ? T : NIL;
     }
-
 }
diff --git a/src/main/function/builtin/predicate/EQ.java b/src/main/function/builtin/predicate/EQ.java
index a659356..489be54 100644
--- a/src/main/function/builtin/predicate/EQ.java
+++ b/src/main/function/builtin/predicate/EQ.java
@@ -52,5 +52,4 @@ public class EQ extends LispFunction {
     private SExpression listEq(SExpression firstArgument, SExpression secondArgument) {
         return (firstArgument == secondArgument) ? T : NIL;
     }
-
 }
diff --git a/src/main/function/builtin/predicate/EQUAL.java b/src/main/function/builtin/predicate/EQUAL.java
index 5038949..52fce66 100644
--- a/src/main/function/builtin/predicate/EQUAL.java
+++ b/src/main/function/builtin/predicate/EQUAL.java
@@ -37,5 +37,4 @@ public class EQUAL extends LispFunction {
     private SExpression equal(SExpression firstArgument, SExpression secondArgument) {
         return isEqual(firstArgument, secondArgument) ? T : NIL;
     }
-
 }
diff --git a/src/main/function/builtin/predicate/GENSYM_EQUAL.java b/src/main/function/builtin/predicate/GENSYM_EQUAL.java
index 5ce7214..075a6a2 100644
--- a/src/main/function/builtin/predicate/GENSYM_EQUAL.java
+++ b/src/main/function/builtin/predicate/GENSYM_EQUAL.java
@@ -97,5 +97,4 @@ public class GENSYM_EQUAL extends LispFunction {
             return equalizedExpression;
         }
     }
-
 }
diff --git a/src/main/function/builtin/predicate/LISTP.java b/src/main/function/builtin/predicate/LISTP.java
index 32710f2..7f42a61 100644
--- a/src/main/function/builtin/predicate/LISTP.java
+++ b/src/main/function/builtin/predicate/LISTP.java
@@ -25,5 +25,4 @@ public class LISTP extends LispFunction {
 
         return argumentList.getFirst().isList() ? T : NIL;
     }
-
 }
diff --git a/src/main/function/builtin/predicate/NULL.java b/src/main/function/builtin/predicate/NULL.java
index bd54ee7..1ad1e9b 100644
--- a/src/main/function/builtin/predicate/NULL.java
+++ b/src/main/function/builtin/predicate/NULL.java
@@ -25,5 +25,4 @@ public class NULL extends LispFunction {
 
         return argumentList.getFirst().isNull() ? T : NIL;
     }
-
 }
diff --git a/src/main/function/builtin/predicate/NUMERIC_EQUAL.java b/src/main/function/builtin/predicate/NUMERIC_EQUAL.java
index 76de5e4..6ad23b0 100644
--- a/src/main/function/builtin/predicate/NUMERIC_EQUAL.java
+++ b/src/main/function/builtin/predicate/NUMERIC_EQUAL.java
@@ -51,5 +51,4 @@ public class NUMERIC_EQUAL extends LispFunction {
     private boolean isEqual(LispNumber number1, LispNumber number2) {
         return number1.getValue().equals(number2.getValue());
     }
-
 }
diff --git a/src/main/function/builtin/predicate/NUMERIC_GREATER.java b/src/main/function/builtin/predicate/NUMERIC_GREATER.java
index 5dbe2e4..af253d4 100644
--- a/src/main/function/builtin/predicate/NUMERIC_GREATER.java
+++ b/src/main/function/builtin/predicate/NUMERIC_GREATER.java
@@ -51,5 +51,4 @@ public class NUMERIC_GREATER extends LispFunction {
     private boolean isFirstGreater(LispNumber number1, LispNumber number2) {
         return number1.getValue().compareTo(number2.getValue()) > 0;
     }
-
 }
diff --git a/src/main/function/builtin/predicate/NUMERIC_LESS.java b/src/main/function/builtin/predicate/NUMERIC_LESS.java
index d70950d..4311c4b 100644
--- a/src/main/function/builtin/predicate/NUMERIC_LESS.java
+++ b/src/main/function/builtin/predicate/NUMERIC_LESS.java
@@ -51,5 +51,4 @@ public class NUMERIC_LESS extends LispFunction {
     private boolean isFirstLesser(LispNumber number1, LispNumber number2) {
         return number1.getValue().compareTo(number2.getValue()) < 0;
     }
-
 }
diff --git a/src/main/function/builtin/special/AND.java b/src/main/function/builtin/special/AND.java
index aa18d0c..1930562 100644
--- a/src/main/function/builtin/special/AND.java
+++ b/src/main/function/builtin/special/AND.java
@@ -40,5 +40,4 @@ public class AND extends LispSpecialFunction {
 
         return tailCall(() -> callTailRecursive(remainingValues, currentValue));
     }
-
 }
diff --git a/src/main/function/builtin/special/CASE.java b/src/main/function/builtin/special/CASE.java
index e839f33..6de951e 100644
--- a/src/main/function/builtin/special/CASE.java
+++ b/src/main/function/builtin/special/CASE.java
@@ -82,5 +82,4 @@ public class CASE extends LispSpecialFunction {
 
         return lastConsequentValue;
     }
-
 }
diff --git a/src/main/function/builtin/special/COND.java b/src/main/function/builtin/special/COND.java
index 8875b91..31878ed 100644
--- a/src/main/function/builtin/special/COND.java
+++ b/src/main/function/builtin/special/COND.java
@@ -65,5 +65,4 @@ public class COND extends LispSpecialFunction {
     private SExpression getFirst(SExpression knownCons) {
         return ((Cons) knownCons).getFirst();
     }
-
 }
diff --git a/src/main/function/builtin/special/DEFINE_SPECIAL.java b/src/main/function/builtin/special/DEFINE_SPECIAL.java
index 18a736e..d69d2a1 100644
--- a/src/main/function/builtin/special/DEFINE_SPECIAL.java
+++ b/src/main/function/builtin/special/DEFINE_SPECIAL.java
@@ -17,5 +17,4 @@ public class DEFINE_SPECIAL extends Define {
     protected UserDefinedFunction createFunction(SExpression functionName, Cons lambdaList, Cons functionBody) {
         return new UserDefinedSpecialFunction(functionName.toString(), lambdaList, functionBody);
     }
-
 }
diff --git a/src/main/function/builtin/special/DEFMACRO.java b/src/main/function/builtin/special/DEFMACRO.java
index f59a33d..d228678 100644
--- a/src/main/function/builtin/special/DEFMACRO.java
+++ b/src/main/function/builtin/special/DEFMACRO.java
@@ -17,5 +17,4 @@ public class DEFMACRO extends Define {
     protected UserDefinedFunction createFunction(SExpression functionName, Cons lambdaList, Cons functionBody) {
         return new UserDefinedMacro(functionName.toString(), lambdaList, functionBody);
     }
-
 }
diff --git a/src/main/function/builtin/special/DEFUN.java b/src/main/function/builtin/special/DEFUN.java
index d2cf917..c7fc9eb 100644
--- a/src/main/function/builtin/special/DEFUN.java
+++ b/src/main/function/builtin/special/DEFUN.java
@@ -16,5 +16,4 @@ public class DEFUN extends Define {
     protected UserDefinedFunction createFunction(SExpression functionName, Cons lambdaList, Cons functionBody) {
         return new UserDefinedFunction(functionName.toString(), lambdaList, functionBody);
     }
-
 }
diff --git a/src/main/function/builtin/special/Define.java b/src/main/function/builtin/special/Define.java
index 91697a1..eb065d9 100644
--- a/src/main/function/builtin/special/Define.java
+++ b/src/main/function/builtin/special/Define.java
@@ -74,5 +74,4 @@ public abstract class Define extends LispSpecialFunction {
             return format("redefining function {0}", functionName);
         }
     }
-
 }
diff --git a/src/main/function/builtin/special/IF.java b/src/main/function/builtin/special/IF.java
index b1b5da9..6a58076 100644
--- a/src/main/function/builtin/special/IF.java
+++ b/src/main/function/builtin/special/IF.java
@@ -49,5 +49,4 @@ public class IF extends LispSpecialFunction {
 
         return getRestOfList(expressions).getFirst();
     }
-
 }
diff --git a/src/main/function/builtin/special/LAMBDA.java b/src/main/function/builtin/special/LAMBDA.java
index b33eb5c..a5ad2db 100644
--- a/src/main/function/builtin/special/LAMBDA.java
+++ b/src/main/function/builtin/special/LAMBDA.java
@@ -66,5 +66,4 @@ public class LAMBDA extends LispSpecialFunction {
     private Cons makeOriginalLambdaExpression(Cons argumentList) {
         return new Cons(new Symbol("LAMBDA"), argumentList);
     }
-
 }
diff --git a/src/main/function/builtin/special/LET.java b/src/main/function/builtin/special/LET.java
index 80324d7..ee0e752 100644
--- a/src/main/function/builtin/special/LET.java
+++ b/src/main/function/builtin/special/LET.java
@@ -90,5 +90,4 @@ public class LET extends LispSpecialFunction {
     private void restorePreviousScope(SymbolTable localScope) {
         executionContext.setScope(localScope.getParent());
     }
-
 }
diff --git a/src/main/function/builtin/special/LET_STAR.java b/src/main/function/builtin/special/LET_STAR.java
index 39dca55..41373c5 100644
--- a/src/main/function/builtin/special/LET_STAR.java
+++ b/src/main/function/builtin/special/LET_STAR.java
@@ -19,5 +19,4 @@ public class LET_STAR extends LET {
 
         return localScope;
     }
-
 }
diff --git a/src/main/function/builtin/special/OR.java b/src/main/function/builtin/special/OR.java
index 43ec14e..722e084 100644
--- a/src/main/function/builtin/special/OR.java
+++ b/src/main/function/builtin/special/OR.java
@@ -36,5 +36,4 @@ public class OR extends LispSpecialFunction {
 
         return tailCall(() -> callTailRecursive(remainingValues));
     }
-
 }
diff --git a/src/main/function/builtin/special/PROGN.java b/src/main/function/builtin/special/PROGN.java
index be97589..d819bff 100644
--- a/src/main/function/builtin/special/PROGN.java
+++ b/src/main/function/builtin/special/PROGN.java
@@ -37,5 +37,4 @@ public class PROGN extends LispSpecialFunction {
 
         return tailCall(() -> callTailRecursive(remainingValues, currentValue));
     }
-
 }
diff --git a/src/main/function/builtin/special/QUOTE.java b/src/main/function/builtin/special/QUOTE.java
index 7952140..e0bcb3b 100644
--- a/src/main/function/builtin/special/QUOTE.java
+++ b/src/main/function/builtin/special/QUOTE.java
@@ -22,5 +22,4 @@ public class QUOTE extends LispSpecialFunction {
 
         return argumentList.getFirst();
     }
-
 }
diff --git a/src/main/function/builtin/special/RECUR.java b/src/main/function/builtin/special/RECUR.java
index 4d025f0..66ce1f8 100644
--- a/src/main/function/builtin/special/RECUR.java
+++ b/src/main/function/builtin/special/RECUR.java
@@ -87,5 +87,4 @@ public class RECUR extends LispSpecialFunction {
             return "recur not in tail position";
         }
     }
-
 }
diff --git a/src/main/function/builtin/special/SETQ.java b/src/main/function/builtin/special/SETQ.java
index 0dc6229..4572ca5 100644
--- a/src/main/function/builtin/special/SETQ.java
+++ b/src/main/function/builtin/special/SETQ.java
@@ -35,5 +35,4 @@ public class SETQ extends LispSpecialFunction {
 
         return new Cons(argumentList.getFirst(), makeList(value));
     }
-
 }
diff --git a/src/main/interpreter/FileLispInterpreter.java b/src/main/interpreter/FileLispInterpreter.java
index f5c0288..8b6bd98 100644
--- a/src/main/interpreter/FileLispInterpreter.java
+++ b/src/main/interpreter/FileLispInterpreter.java
@@ -25,5 +25,4 @@ public class FileLispInterpreter extends LispInterpreter {
 
         super.applyFinishingTouches();
     }
-
 }
diff --git a/src/main/interpreter/InteractiveLispInterpreter.java b/src/main/interpreter/InteractiveLispInterpreter.java
index 94fb537..f326475 100644
--- a/src/main/interpreter/InteractiveLispInterpreter.java
+++ b/src/main/interpreter/InteractiveLispInterpreter.java
@@ -21,5 +21,4 @@ public class InteractiveLispInterpreter extends LispInterpreter {
         environment.getOutput().println(environment.decoratePrompt(""));
         environment.getOutput().flush();
     }
-
 }
diff --git a/src/main/interpreter/LispInterpreter.java b/src/main/interpreter/LispInterpreter.java
index 36f6a92..1c9fca2 100644
--- a/src/main/interpreter/LispInterpreter.java
+++ b/src/main/interpreter/LispInterpreter.java
@@ -90,5 +90,4 @@ public class LispInterpreter {
             return name;
         }
     }
-
 }
diff --git a/src/main/interpreter/LispInterpreterBuilder.java b/src/main/interpreter/LispInterpreterBuilder.java
index c21a02c..ff6267b 100644
--- a/src/main/interpreter/LispInterpreterBuilder.java
+++ b/src/main/interpreter/LispInterpreterBuilder.java
@@ -35,5 +35,4 @@ public interface LispInterpreterBuilder {
     LispInterpreter build();
 
     default void reset() {}
-
 }
diff --git a/src/main/interpreter/LispInterpreterBuilderImpl.java b/src/main/interpreter/LispInterpreterBuilderImpl.java
index 5524074..d73ba90 100644
--- a/src/main/interpreter/LispInterpreterBuilderImpl.java
+++ b/src/main/interpreter/LispInterpreterBuilderImpl.java
@@ -63,7 +63,6 @@ public class LispInterpreterBuilderImpl implements LispInterpreterBuilder {
     @Override
     public void setOutput(PrintStream outputStream) {
         this.outputStream = outputStream;
-
     }
 
     @Override
@@ -115,13 +114,11 @@ public class LispInterpreterBuilderImpl implements LispInterpreterBuilder {
     @Override
     public void setWarningOutputDecorator(Function<String, String> decorator) {
         this.warningOutputDecorator = decorator;
-
     }
 
     @Override
     public void setErrorOutputDecorator(Function<String, String> decorator) {
         this.errorOutputDecorator = decorator;
-
     }
 
     @Override
@@ -217,5 +214,4 @@ public class LispInterpreterBuilderImpl implements LispInterpreterBuilder {
             return message;
         }
     }
-
 }
diff --git a/src/main/parser/LispParser.java b/src/main/parser/LispParser.java
index e28ff58..160db7d 100644
--- a/src/main/parser/LispParser.java
+++ b/src/main/parser/LispParser.java
@@ -60,5 +60,4 @@ public class LispParser {
             throw exceptionToThrow;
         }
     }
-
 }
diff --git a/src/main/recursion/TailCall.java b/src/main/recursion/TailCall.java
index 260425f..cf21548 100644
--- a/src/main/recursion/TailCall.java
+++ b/src/main/recursion/TailCall.java
@@ -26,5 +26,4 @@ public interface TailCall<T> {
 
         // @formatter:on
     }
-
 }
diff --git a/src/main/recursion/TailCalls.java b/src/main/recursion/TailCalls.java
index f5137b6..3950b2f 100644
--- a/src/main/recursion/TailCalls.java
+++ b/src/main/recursion/TailCalls.java
@@ -25,5 +25,4 @@ public class TailCalls {
             }
         };
     }
-
 }
\ No newline at end of file
diff --git a/src/main/scanner/LispCommentRemovingInputStream.java b/src/main/scanner/LispCommentRemovingInputStream.java
index 084a34d..c866076 100644
--- a/src/main/scanner/LispCommentRemovingInputStream.java
+++ b/src/main/scanner/LispCommentRemovingInputStream.java
@@ -80,5 +80,4 @@ public class LispCommentRemovingInputStream implements LispInputStream {
 
         this.rereadLastCharacter = true;
     }
-
 }
diff --git a/src/main/scanner/LispInputStream.java b/src/main/scanner/LispInputStream.java
index 014afd0..aa856a0 100644
--- a/src/main/scanner/LispInputStream.java
+++ b/src/main/scanner/LispInputStream.java
@@ -12,5 +12,4 @@ public interface LispInputStream {
 
         private static final long serialVersionUID = 1L;
     }
-
 }
diff --git a/src/main/scanner/LispScanner.java b/src/main/scanner/LispScanner.java
index 3e58834..1b8a1cc 100644
--- a/src/main/scanner/LispScanner.java
+++ b/src/main/scanner/LispScanner.java
@@ -183,5 +183,4 @@ public class LispScanner {
             return "unterminated quoted string";
         }
     }
-
 }
diff --git a/src/main/sexpression/AtSignExpression.java b/src/main/sexpression/AtSignExpression.java
index bb73362..98c3008 100644
--- a/src/main/sexpression/AtSignExpression.java
+++ b/src/main/sexpression/AtSignExpression.java
@@ -21,5 +21,4 @@ public class AtSignExpression extends SExpression {
     public String toString() {
         return "@" + expression;
     }
-
 }
diff --git a/src/main/sexpression/Atom.java b/src/main/sexpression/Atom.java
index 69c973b..14ff7b1 100644
--- a/src/main/sexpression/Atom.java
+++ b/src/main/sexpression/Atom.java
@@ -18,5 +18,4 @@ public abstract class Atom extends SExpression {
     public String toString() {
         return text;
     }
-
 }
diff --git a/src/main/sexpression/BackquoteExpression.java b/src/main/sexpression/BackquoteExpression.java
index ec88673..ec59adc 100644
--- a/src/main/sexpression/BackquoteExpression.java
+++ b/src/main/sexpression/BackquoteExpression.java
@@ -21,5 +21,4 @@ public class BackquoteExpression extends SExpression {
     public String toString() {
         return "`" + expression;
     }
-
 }
diff --git a/src/main/sexpression/CommaExpression.java b/src/main/sexpression/CommaExpression.java
index b10b7a6..71e4744 100644
--- a/src/main/sexpression/CommaExpression.java
+++ b/src/main/sexpression/CommaExpression.java
@@ -21,5 +21,4 @@ public class CommaExpression extends SExpression {
     public String toString() {
         return "," + expression;
     }
-
 }
diff --git a/src/main/sexpression/Cons.java b/src/main/sexpression/Cons.java
index 4789224..a3652c1 100644
--- a/src/main/sexpression/Cons.java
+++ b/src/main/sexpression/Cons.java
@@ -53,5 +53,4 @@ public class Cons extends SExpression {
 
         return done(leadingString.append(" . " + rest.toString() + ")").toString());
     }
-
 }
diff --git a/src/main/sexpression/DisplayName.java b/src/main/sexpression/DisplayName.java
index fc97d80..d116ce7 100644
--- a/src/main/sexpression/DisplayName.java
+++ b/src/main/sexpression/DisplayName.java
@@ -10,5 +10,4 @@ import java.lang.annotation.Target;
 public @interface DisplayName {
 
     String value();
-
 }
diff --git a/src/main/sexpression/LambdaExpression.java b/src/main/sexpression/LambdaExpression.java
index 04a9d5c..0c46ebc 100644
--- a/src/main/sexpression/LambdaExpression.java
+++ b/src/main/sexpression/LambdaExpression.java
@@ -30,5 +30,4 @@ public class LambdaExpression extends SExpression {
     public String toString() {
         return lambdaExpression.toString();
     }
-
 }
diff --git a/src/main/sexpression/LispNumber.java b/src/main/sexpression/LispNumber.java
index bb00a96..ebd4c70 100644
--- a/src/main/sexpression/LispNumber.java
+++ b/src/main/sexpression/LispNumber.java
@@ -53,5 +53,4 @@ public class LispNumber extends Atom {
             return format("{0} is not a valid integer", text);
         }
     }
-
 }
diff --git a/src/main/sexpression/LispString.java b/src/main/sexpression/LispString.java
index 89898ff..e433eac 100644
--- a/src/main/sexpression/LispString.java
+++ b/src/main/sexpression/LispString.java
@@ -11,5 +11,4 @@ public class LispString extends Atom {
     public boolean isString() {
         return true;
     }
-
 }
diff --git a/src/main/sexpression/Nil.java b/src/main/sexpression/Nil.java
index cf3bc9a..6192673 100644
--- a/src/main/sexpression/Nil.java
+++ b/src/main/sexpression/Nil.java
@@ -48,5 +48,4 @@ public class Nil extends Cons {
     public String toString() {
         return "NIL";
     }
-
 }
diff --git a/src/main/sexpression/SExpression.java b/src/main/sexpression/SExpression.java
index acc99ed..476bf97 100644
--- a/src/main/sexpression/SExpression.java
+++ b/src/main/sexpression/SExpression.java
@@ -46,5 +46,4 @@ public abstract class SExpression {
     public boolean isAtSign() {
         return false;
     }
-
 }
diff --git a/src/main/sexpression/Symbol.java b/src/main/sexpression/Symbol.java
index ae6e032..3e998b9 100644
--- a/src/main/sexpression/Symbol.java
+++ b/src/main/sexpression/Symbol.java
@@ -19,5 +19,4 @@ public class Symbol extends Atom {
     public boolean isSymbol() {
         return true;
     }
-
 }
diff --git a/src/main/stream/SafeInputStream.java b/src/main/stream/SafeInputStream.java
index e817994..ae3c06c 100644
--- a/src/main/stream/SafeInputStream.java
+++ b/src/main/stream/SafeInputStream.java
@@ -29,5 +29,4 @@ public class SafeInputStream {
             throw new UncheckedIOException(e);
         }
     }
-
 }
\ No newline at end of file
diff --git a/src/main/stream/SafeOutputStream.java b/src/main/stream/SafeOutputStream.java
index e82beae..effde5f 100644
--- a/src/main/stream/SafeOutputStream.java
+++ b/src/main/stream/SafeOutputStream.java
@@ -35,5 +35,4 @@ public class SafeOutputStream {
             throw new UncheckedIOException(e);
         }
     }
-
 }
\ No newline at end of file
diff --git a/src/main/stream/UncheckedIOException.java b/src/main/stream/UncheckedIOException.java
index de93070..196221e 100644
--- a/src/main/stream/UncheckedIOException.java
+++ b/src/main/stream/UncheckedIOException.java
@@ -17,5 +17,4 @@ public class UncheckedIOException extends CriticalLispException {
     public String getMessage() {
         return exception.getMessage();
     }
-
 }
\ No newline at end of file
diff --git a/src/main/table/FunctionTable.java b/src/main/table/FunctionTable.java
index 8a82eba..4bcabbd 100644
--- a/src/main/table/FunctionTable.java
+++ b/src/main/table/FunctionTable.java
@@ -197,5 +197,4 @@ public class FunctionTable {
             return format("Could not create an instance of ''{0}''", functionName);
         }
     }
-
 }
diff --git a/src/main/table/SymbolTable.java b/src/main/table/SymbolTable.java
index 0088983..f8a5aaf 100644
--- a/src/main/table/SymbolTable.java
+++ b/src/main/table/SymbolTable.java
@@ -63,5 +63,4 @@ public class SymbolTable {
     private Cons makeSymbolValuePair(Entry<String, SExpression> binding) {
         return new Cons(new Symbol(binding.getKey()), makeList(binding.getValue()));
     }
-
 }
diff --git a/src/main/terminal/ControlSequenceHandler.java b/src/main/terminal/ControlSequenceHandler.java
index fa4a4c3..395ba5a 100644
--- a/src/main/terminal/ControlSequenceHandler.java
+++ b/src/main/terminal/ControlSequenceHandler.java
@@ -57,5 +57,4 @@ class ControlSequenceHandler {
     private boolean isPartOfCode() {
         return isCharacter() && isDigit((char) currentCharacter);
     }
-
 }
diff --git a/src/main/terminal/ControlSequenceLookup.java b/src/main/terminal/ControlSequenceLookup.java
index 59b3f9a..ac21133 100644
--- a/src/main/terminal/ControlSequenceLookup.java
+++ b/src/main/terminal/ControlSequenceLookup.java
@@ -31,5 +31,4 @@ public class ControlSequenceLookup {
 
         return codes.getOrDefault(code, new NullControlSequence());
     }
-
 }
\ No newline at end of file
diff --git a/src/main/terminal/LispTerminal.java b/src/main/terminal/LispTerminal.java
index 771c860..119314f 100644
--- a/src/main/terminal/LispTerminal.java
+++ b/src/main/terminal/LispTerminal.java
@@ -210,7 +210,8 @@ public class LispTerminal {
             TerminalPosition cursorPosition = terminal.getCursorPosition();
             terminal.putCharacter(character);
             moveCursorToNextRow(cursorPosition);
-        } else
+        }
+        else
             terminal.putCharacter(character);
     }
 
@@ -393,7 +394,8 @@ public class LispTerminal {
     private void takeNap() {
         try {
             Thread.sleep(1);
-        } catch (InterruptedException ignored) {}
+        } catch (InterruptedException ignored) {
+        }
     }
 
     private void writeOutput() {
@@ -458,5 +460,4 @@ public class LispTerminal {
         isStopped = true;
         inputWriter.close();
     }
-
 }
diff --git a/src/main/terminal/SelectGraphicRendition.java b/src/main/terminal/SelectGraphicRendition.java
index aa71a4c..9b4d9b5 100644
--- a/src/main/terminal/SelectGraphicRendition.java
+++ b/src/main/terminal/SelectGraphicRendition.java
@@ -6,7 +6,6 @@ import com.googlecode.lanterna.terminal.IOSafeTerminal;
 public enum SelectGraphicRendition implements ControlSequence {
 
     RESET {
-
         @Override
         public String getCode() {
             return "0";
@@ -19,7 +18,6 @@ public enum SelectGraphicRendition implements ControlSequence {
     },
 
     RED {
-
         @Override
         public String getCode() {
             return "31";
@@ -32,7 +30,6 @@ public enum SelectGraphicRendition implements ControlSequence {
     },
 
     GREEN {
-
         @Override
         public String getCode() {
             return "32";
@@ -45,7 +42,6 @@ public enum SelectGraphicRendition implements ControlSequence {
     },
 
     YELLOW {
-
         @Override
         public String getCode() {
             return "33";
@@ -58,7 +54,6 @@ public enum SelectGraphicRendition implements ControlSequence {
     },
 
     PURPLE {
-
         @Override
         public String getCode() {
             return "35";
diff --git a/src/main/terminal/TerminalConfiguration.java b/src/main/terminal/TerminalConfiguration.java
index 0a26a35..294a52c 100644
--- a/src/main/terminal/TerminalConfiguration.java
+++ b/src/main/terminal/TerminalConfiguration.java
@@ -67,5 +67,4 @@ public class TerminalConfiguration {
     public IOSafeTerminal getTerminal() {
         return terminal;
     }
-
 }
\ No newline at end of file
diff --git a/src/main/terminal/TerminalHistory.java b/src/main/terminal/TerminalHistory.java
index e2b6f25..63fb0ca 100644
--- a/src/main/terminal/TerminalHistory.java
+++ b/src/main/terminal/TerminalHistory.java
@@ -49,5 +49,4 @@ public class TerminalHistory {
     public boolean isEnd() {
         return lineIndex == lastIndex();
     }
-
 }
diff --git a/src/main/token/AtSign.java b/src/main/token/AtSign.java
index d057b5e..483ad17 100644
--- a/src/main/token/AtSign.java
+++ b/src/main/token/AtSign.java
@@ -19,5 +19,4 @@ public class AtSign extends Token {
 
         return new AtSignExpression(argument);
     }
-
 }
diff --git a/src/main/token/Backquote.java b/src/main/token/Backquote.java
index 4b10cbe..5fdb321 100644
--- a/src/main/token/Backquote.java
+++ b/src/main/token/Backquote.java
@@ -19,5 +19,4 @@ public class Backquote extends Token {
 
         return new BackquoteExpression(argument);
     }
-
 }
diff --git a/src/main/token/Comma.java b/src/main/token/Comma.java
index 0a419fe..ad90e75 100644
--- a/src/main/token/Comma.java
+++ b/src/main/token/Comma.java
@@ -19,5 +19,4 @@ public class Comma extends Token {
 
         return new CommaExpression(argument);
     }
-
 }
diff --git a/src/main/token/Eof.java b/src/main/token/Eof.java
index 4034a6b..70d4b09 100644
--- a/src/main/token/Eof.java
+++ b/src/main/token/Eof.java
@@ -30,5 +30,4 @@ public class Eof extends Token {
             return "end-of-file encountered";
         }
     }
-
 }
diff --git a/src/main/token/Identifier.java b/src/main/token/Identifier.java
index f425de4..77c270e 100644
--- a/src/main/token/Identifier.java
+++ b/src/main/token/Identifier.java
@@ -16,5 +16,4 @@ public class Identifier extends Token {
     public SExpression parseSExpression(Supplier<Token> getNextToken) {
         return new Symbol(getText());
     }
-
 }
diff --git a/src/main/token/LeftParenthesis.java b/src/main/token/LeftParenthesis.java
index 1f27542..409e998 100644
--- a/src/main/token/LeftParenthesis.java
+++ b/src/main/token/LeftParenthesis.java
@@ -17,5 +17,4 @@ public class LeftParenthesis extends Token {
 
         return nextToken.parseListTail(getNextToken).invoke();
     }
-
 }
diff --git a/src/main/token/Number.java b/src/main/token/Number.java
index dad0d82..e4f29aa 100644
--- a/src/main/token/Number.java
+++ b/src/main/token/Number.java
@@ -16,5 +16,4 @@ public class Number extends Token {
     public SExpression parseSExpression(Supplier<Token> getNextToken) {
         return new LispNumber(getText());
     }
-
 }
diff --git a/src/main/token/QuoteMark.java b/src/main/token/QuoteMark.java
index 8dba568..10a0f1b 100644
--- a/src/main/token/QuoteMark.java
+++ b/src/main/token/QuoteMark.java
@@ -22,5 +22,4 @@ public class QuoteMark extends Token {
 
         return new Cons(Symbol.createQuote(), new Cons(argument, NIL));
     }
-
 }
diff --git a/src/main/token/QuotedString.java b/src/main/token/QuotedString.java
index 22b08b9..17f281c 100644
--- a/src/main/token/QuotedString.java
+++ b/src/main/token/QuotedString.java
@@ -16,5 +16,4 @@ public class QuotedString extends Token {
     public SExpression parseSExpression(Supplier<Token> getNextToken) {
         return new LispString(getText());
     }
-
 }
diff --git a/src/main/token/RightParenthesis.java b/src/main/token/RightParenthesis.java
index e76b9d6..ec30d8e 100644
--- a/src/main/token/RightParenthesis.java
+++ b/src/main/token/RightParenthesis.java
@@ -45,5 +45,4 @@ public class RightParenthesis extends Token {
             return "expression begins with ')'";
         }
     }
-
 }
diff --git a/src/main/token/Token.java b/src/main/token/Token.java
index 14e479f..c23b777 100644
--- a/src/main/token/Token.java
+++ b/src/main/token/Token.java
@@ -52,5 +52,4 @@ public abstract class Token {
 
         return tailCall(() -> next.parseListTailRecursive(start, newEnd, getNextToken));
     }
-
 }
diff --git a/src/main/token/TokenFactory.java b/src/main/token/TokenFactory.java
index d35aa89..cf3cbc4 100644
--- a/src/main/token/TokenFactory.java
+++ b/src/main/token/TokenFactory.java
@@ -41,5 +41,4 @@ public interface TokenFactory {
             return format("illegal character >>{0}<<", text);
         }
     }
-
 }
diff --git a/src/main/token/TokenFactoryImpl.java b/src/main/token/TokenFactoryImpl.java
index 706df21..25adace 100644
--- a/src/main/token/TokenFactoryImpl.java
+++ b/src/main/token/TokenFactoryImpl.java
@@ -23,25 +23,25 @@ public class TokenFactoryImpl implements TokenFactory {
         char firstCharacter = text.charAt(0);
 
         switch (firstCharacter) {
-        case LEFT_PARENTHESIS:
-            return new LeftParenthesis(text, position);
-        case RIGHT_PARENTHESIS:
-            return new RightParenthesis(text, position);
-        case SINGLE_QUOTE:
-            return new QuoteMark(text, position);
-        case DOUBLE_QUOTE:
-            return new QuotedString(text, position);
-        case BACKQUOTE:
-            return new Backquote(text, position);
-        case AT_SIGN:
-            return new AtSign(text, position);
-        case COMMA:
-            return new Comma(text, position);
-        default:
-            if (isNumeric(firstCharacter, text))
-                return new Number(text, position);
-            else if (isLegalIdentifierCharacter(firstCharacter))
-                return new Identifier(text, position);
+            case LEFT_PARENTHESIS:
+                return new LeftParenthesis(text, position);
+            case RIGHT_PARENTHESIS:
+                return new RightParenthesis(text, position);
+            case SINGLE_QUOTE:
+                return new QuoteMark(text, position);
+            case DOUBLE_QUOTE:
+                return new QuotedString(text, position);
+            case BACKQUOTE:
+                return new Backquote(text, position);
+            case AT_SIGN:
+                return new AtSign(text, position);
+            case COMMA:
+                return new Comma(text, position);
+            default:
+                if (isNumeric(firstCharacter, text))
+                    return new Number(text, position);
+                else if (isLegalIdentifierCharacter(firstCharacter))
+                    return new Identifier(text, position);
         }
 
         throw new BadCharacterException(text, position);
@@ -63,5 +63,4 @@ public class TokenFactoryImpl implements TokenFactory {
     public Token createEofToken(FilePosition position) {
         return new Eof("EOF", position);
     }
-
 }
diff --git a/src/main/util/Characters.java b/src/main/util/Characters.java
index 8211812..7a3a2e9 100644
--- a/src/main/util/Characters.java
+++ b/src/main/util/Characters.java
@@ -57,5 +57,4 @@ public final class Characters {
     public static boolean isNumberPrefix(char c) {
         return c == DASH || c == PLUS;
     }
-
 }
diff --git a/src/main/util/Path.java b/src/main/util/Path.java
index 4cd97db..c845e8e 100644
--- a/src/main/util/Path.java
+++ b/src/main/util/Path.java
@@ -9,5 +9,4 @@ public final class Path {
     public static String getPathPrefix(String fileName) {
         return fileName.substring(0, fileName.lastIndexOf(File.separator) + 1);
     }
-
 }
diff --git a/src/test/acceptance/fixture/LispInterpreterFixture.java b/src/test/acceptance/fixture/LispInterpreterFixture.java
index 622f6a3..f084f1f 100644
--- a/src/test/acceptance/fixture/LispInterpreterFixture.java
+++ b/src/test/acceptance/fixture/LispInterpreterFixture.java
@@ -75,5 +75,4 @@ public class LispInterpreterFixture {
 
         return output.trim();
     }
-
 }
diff --git a/src/test/application/MainTest.java b/src/test/application/MainTest.java
index f385856..321aa17 100644
--- a/src/test/application/MainTest.java
+++ b/src/test/application/MainTest.java
@@ -64,7 +64,8 @@ public class MainTest extends SymbolAndFunctionCleaner {
     private void waitForInterpreterToShutdown() {
         try {
             latch.await();
-        } catch (InterruptedException ignored) {}
+        } catch (InterruptedException ignored) {
+        }
     }
 
     private String getSystemOutLog() {
@@ -106,7 +107,6 @@ public class MainTest extends SymbolAndFunctionCleaner {
         exit.checkAssertionAfterwards(() -> {
             assertEquals(format("{0}{1}{2}\n", ANSI_PURPLE, expectedMessage, ANSI_RESET), getSystemErrLog());
             assertEquals("", getSystemOutLog());
-
         });
 
         runInterpreterWithFile("src/test/application/test-files/bad.lisp");
@@ -143,5 +143,4 @@ public class MainTest extends SymbolAndFunctionCleaner {
         assertEquals("", getSystemErrLog());
         assertEquals(format("{0}{1}{2}\n\n", ANSI_GREEN, "RADISH", ANSI_RESET), getSystemOutLog());
     }
-
 }
diff --git a/src/test/environment/RuntimeEnvironmentTest.java b/src/test/environment/RuntimeEnvironmentTest.java
index a18820a..099df93 100644
--- a/src/test/environment/RuntimeEnvironmentTest.java
+++ b/src/test/environment/RuntimeEnvironmentTest.java
@@ -158,37 +158,43 @@ public class RuntimeEnvironmentTest {
         try {
             environment.terminateSuccessfully();
             fail("terminateSuccessfully");
-        } catch (NullPointerException e) {}
+        } catch (NullPointerException e) {
+        }
 
         try {
             environment.terminateExceptionally();
             fail("terminateExceptionally");
-        } catch (NullPointerException e) {}
+        } catch (NullPointerException e) {
+        }
 
         try {
             environment.decoratePrompt("");
             fail("decoratePrompt");
-        } catch (NullPointerException e) {}
+        } catch (NullPointerException e) {
+        }
 
         try {
             environment.decorateValueOutput("");
             fail("decorateValueOutput");
-        } catch (NullPointerException e) {}
+        } catch (NullPointerException e) {
+        }
 
         try {
             environment.decorateWarningOutput("");
             fail("decorateWarningOutput");
-        } catch (NullPointerException e) {}
+        } catch (NullPointerException e) {
+        }
 
         try {
             environment.decorateErrorOutput("");
             fail("decorateErrorOutput");
-        } catch (NullPointerException e) {}
+        } catch (NullPointerException e) {
+        }
 
         try {
             environment.decorateCriticalOutput("");
             fail("decorateCriticalOutput");
-        } catch (NullPointerException e) {}
+        } catch (NullPointerException e) {
+        }
     }
-
 }
diff --git a/src/test/error/ErrorManagerTest.java b/src/test/error/ErrorManagerTest.java
index d04f4c6..3075765 100644
--- a/src/test/error/ErrorManagerTest.java
+++ b/src/test/error/ErrorManagerTest.java
@@ -163,5 +163,4 @@ public class ErrorManagerTest {
         for (Severity severity : Severity.values())
             Severity.valueOf(severity.toString());
     }
-
 }
diff --git a/src/test/file/FilePositionTrackerTest.java b/src/test/file/FilePositionTrackerTest.java
index b62ddf3..715ae16 100644
--- a/src/test/file/FilePositionTrackerTest.java
+++ b/src/test/file/FilePositionTrackerTest.java
@@ -62,5 +62,4 @@ public class FilePositionTrackerTest {
 
         assertTrackerPositionEquals(createFilePosition(2, 0));
     }
-
 }
diff --git a/src/test/function/ArgumentValidatorTest.java b/src/test/function/ArgumentValidatorTest.java
index 6900fd2..cfb8291 100644
--- a/src/test/function/ArgumentValidatorTest.java
+++ b/src/test/function/ArgumentValidatorTest.java
@@ -222,5 +222,4 @@ public class ArgumentValidatorTest {
         validator.setEveryArgumentExcludedType(Nil.class);
         validator.validate(new Cons(T, new Cons(NIL, NIL)));
     }
-
 }
diff --git a/src/test/function/LispFunctionTest.java b/src/test/function/LispFunctionTest.java
index 7bb4760..9a516e4 100644
--- a/src/test/function/LispFunctionTest.java
+++ b/src/test/function/LispFunctionTest.java
@@ -21,5 +21,4 @@ public class LispFunctionTest {
 
         assertTrue(lispFunction.isArgumentListEvaluated());
     }
-
 }
diff --git a/src/test/function/LispSpecialFunctionTest.java b/src/test/function/LispSpecialFunctionTest.java
index 87c1b6a..300c61a 100644
--- a/src/test/function/LispSpecialFunctionTest.java
+++ b/src/test/function/LispSpecialFunctionTest.java
@@ -21,5 +21,4 @@ public class LispSpecialFunctionTest {
 
         assertFalse(lispFunction.isArgumentListEvaluated());
     }
-
 }
diff --git a/src/test/function/UserDefinedFunctionTest.java b/src/test/function/UserDefinedFunctionTest.java
index 1ec8d3c..1d35be5 100644
--- a/src/test/function/UserDefinedFunctionTest.java
+++ b/src/test/function/UserDefinedFunctionTest.java
@@ -77,5 +77,4 @@ public class UserDefinedFunctionTest {
         assertTrue(e.getMessage().length() > 0);
         assertEquals(ErrorManager.Severity.ERROR, e.getSeverity());
     }
-
 }
diff --git a/src/test/function/builtin/BackquoteEvaluatorTest.java b/src/test/function/builtin/BackquoteEvaluatorTest.java
index 88a3241..071a921 100644
--- a/src/test/function/builtin/BackquoteEvaluatorTest.java
+++ b/src/test/function/builtin/BackquoteEvaluatorTest.java
@@ -95,7 +95,8 @@ public class BackquoteEvaluatorTest {
 
     @Test(expected = NestedAtSignException.class)
     public void evaluateListWithNestedAtSigns() {
-        SExpression input = makeList(new CommaExpression(new AtSignExpression(new AtSignExpression(makeList(new Symbol("+"))))));
+        SExpression input =
+                makeList(new CommaExpression(new AtSignExpression(new AtSignExpression(makeList(new Symbol("+"))))));
         BackquoteEvaluator evaluator = createBackquoteEvaluator(input);
 
         evaluator.evaluate();
@@ -103,7 +104,8 @@ public class BackquoteEvaluatorTest {
 
     @Test(expected = NestedCommaException.class)
     public void evaluateListWithCommaAfterAtSign() {
-        SExpression input = makeList(new CommaExpression(new AtSignExpression(new CommaExpression(makeList(new Symbol("+"))))));
+        SExpression input =
+                makeList(new CommaExpression(new AtSignExpression(new CommaExpression(makeList(new Symbol("+"))))));
         BackquoteEvaluator evaluator = createBackquoteEvaluator(input);
 
         evaluator.evaluate();
@@ -174,5 +176,4 @@ public class BackquoteEvaluatorTest {
         assertIsErrorWithMessage(new AtSignNotInCommaException());
         assertIsErrorWithMessage(new AtSignNotListException());
     }
-
 }
diff --git a/src/test/function/builtin/EVALTest.java b/src/test/function/builtin/EVALTest.java
index ae0fe66..053eb28 100644
--- a/src/test/function/builtin/EVALTest.java
+++ b/src/test/function/builtin/EVALTest.java
@@ -43,7 +43,6 @@ public class EVALTest extends SymbolAndFunctionCleaner {
         String input = "(let ((x 1)) (eval '(+ x 1)))";
 
         assertSExpressionsMatch(parseString("2"), evaluateString(input));
-
     }
 
     @Test
@@ -195,7 +194,8 @@ public class EVALTest extends SymbolAndFunctionCleaner {
         try {
             evaluateString("(let ((n 200)) (begin 1 2 3 y))");
             fail("expected exception");
-        } catch (UndefinedSymbolException e) {}
+        } catch (UndefinedSymbolException e) {
+        }
 
         assertSExpressionsMatch(parseString("100"), evaluateString("n"));
     }
@@ -208,7 +208,8 @@ public class EVALTest extends SymbolAndFunctionCleaner {
             evaluateString("(defun test (n) (begin 1 2 3 y))");
             evaluateString("(test 200)");
             fail("expected exception");
-        } catch (UndefinedSymbolException e) {}
+        } catch (UndefinedSymbolException e) {
+        }
 
         assertSExpressionsMatch(parseString("100"), evaluateString("n"));
     }
@@ -220,7 +221,8 @@ public class EVALTest extends SymbolAndFunctionCleaner {
         try {
             evaluateString("((lambda (n) (begin 1 2 3 y)) 200)");
             fail("expected exception");
-        } catch (UndefinedSymbolException e) {}
+        } catch (UndefinedSymbolException e) {
+        }
 
         assertSExpressionsMatch(parseString("100"), evaluateString("n"));
     }
@@ -233,7 +235,8 @@ public class EVALTest extends SymbolAndFunctionCleaner {
             evaluateString("(defun tail-recursive (n) (begin (recur) 2))");
             evaluateString("(tail-recursive 200)");
             fail("expected exception");
-        } catch (RecurNotInTailPositionException e) {}
+        } catch (RecurNotInTailPositionException e) {
+        }
 
         assertSExpressionsMatch(parseString("100"), evaluateString("n"));
     }
@@ -246,7 +249,8 @@ public class EVALTest extends SymbolAndFunctionCleaner {
             evaluateString("(defun tail-recursive (n) (begin (recur) 2))");
             evaluateString("(apply 'tail-recursive '(200))");
             fail("expected exception");
-        } catch (RecurNotInTailPositionException e) {}
+        } catch (RecurNotInTailPositionException e) {
+        }
 
         assertSExpressionsMatch(parseString("100"), evaluateString("n"));
     }
diff --git a/src/test/function/builtin/EXITTest.java b/src/test/function/builtin/EXITTest.java
index 491dfbd..30569a5 100644
--- a/src/test/function/builtin/EXITTest.java
+++ b/src/test/function/builtin/EXITTest.java
@@ -58,5 +58,4 @@ public class EXITTest extends SymbolAndFunctionCleaner {
     public void exitWithTooManyArguments() {
         evaluateString("(exit 1)");
     }
-
 }
diff --git a/src/test/function/builtin/FUNCALLTest.java b/src/test/function/builtin/FUNCALLTest.java
index be3c329..9dc4057 100644
--- a/src/test/function/builtin/FUNCALLTest.java
+++ b/src/test/function/builtin/FUNCALLTest.java
@@ -38,5 +38,4 @@ public class FUNCALLTest extends SymbolAndFunctionCleaner {
     public void funcallWithTooFewArguments() {
         evaluateString("(funcall)");
     }
-
 }
diff --git a/src/test/function/builtin/GENSYMTest.java b/src/test/function/builtin/GENSYMTest.java
index 780519e..b196096 100644
--- a/src/test/function/builtin/GENSYMTest.java
+++ b/src/test/function/builtin/GENSYMTest.java
@@ -40,5 +40,4 @@ public class GENSYMTest extends SymbolAndFunctionCleaner {
     public void gensymWithTooManyArguments() {
         evaluateString("(gensym 1)");
     }
-
 }
diff --git a/src/test/function/builtin/LOADTest.java b/src/test/function/builtin/LOADTest.java
index a393004..df900da 100644
--- a/src/test/function/builtin/LOADTest.java
+++ b/src/test/function/builtin/LOADTest.java
@@ -132,5 +132,4 @@ public class LOADTest extends SymbolAndFunctionCleaner {
         assertT(evaluateString(input));
         assertNothingPrinted();
     }
-
 }
diff --git a/src/test/function/builtin/PRINTTest.java b/src/test/function/builtin/PRINTTest.java
index 7f70925..97d59e1 100644
--- a/src/test/function/builtin/PRINTTest.java
+++ b/src/test/function/builtin/PRINTTest.java
@@ -64,5 +64,4 @@ public class PRINTTest extends SymbolAndFunctionCleaner {
     public void printWithTooFewArguments() {
         evaluateString("(print)");
     }
-
 }
diff --git a/src/test/function/builtin/SETTest.java b/src/test/function/builtin/SETTest.java
index 9b31bf9..524b6e5 100644
--- a/src/test/function/builtin/SETTest.java
+++ b/src/test/function/builtin/SETTest.java
@@ -81,5 +81,4 @@ public class SETTest extends SymbolAndFunctionCleaner {
     public void setWithTooManyArguments() {
         evaluateString("(set 'a 'b 'c)");
     }
-
 }
diff --git a/src/test/function/builtin/SYMBOL_FUNCTIONTest.java b/src/test/function/builtin/SYMBOL_FUNCTIONTest.java
index 2c85807..ef53fb4 100644
--- a/src/test/function/builtin/SYMBOL_FUNCTIONTest.java
+++ b/src/test/function/builtin/SYMBOL_FUNCTIONTest.java
@@ -70,5 +70,4 @@ public class SYMBOL_FUNCTIONTest extends SymbolAndFunctionCleaner {
         assertNotNull(e.getMessage());
         assertTrue(e.getMessage().length() > 0);
     }
-
 }
diff --git a/src/test/function/builtin/cons/CONSTest.java b/src/test/function/builtin/cons/CONSTest.java
index 5ba1014..2299b74 100644
--- a/src/test/function/builtin/cons/CONSTest.java
+++ b/src/test/function/builtin/cons/CONSTest.java
@@ -58,5 +58,4 @@ public class CONSTest extends SymbolAndFunctionCleaner {
     public void consWithTooFewArguments() {
         evaluateString("(cons 1)");
     }
-
 }
diff --git a/src/test/function/builtin/cons/FIRSTTest.java b/src/test/function/builtin/cons/FIRSTTest.java
index e85bf77..89cdeec 100644
--- a/src/test/function/builtin/cons/FIRSTTest.java
+++ b/src/test/function/builtin/cons/FIRSTTest.java
@@ -55,5 +55,4 @@ public class FIRSTTest extends SymbolAndFunctionCleaner {
     public void firstWithTooFewArguments() {
         evaluateString("(first)");
     }
-
 }
diff --git a/src/test/function/builtin/cons/LENGTHTest.java b/src/test/function/builtin/cons/LENGTHTest.java
index f2acc3d..f46ebf7 100644
--- a/src/test/function/builtin/cons/LENGTHTest.java
+++ b/src/test/function/builtin/cons/LENGTHTest.java
@@ -54,5 +54,4 @@ public class LENGTHTest extends SymbolAndFunctionCleaner {
     public void lengthWithDottedList() {
         evaluateString("(length (cons 1 2))");
     }
-
 }
diff --git a/src/test/function/builtin/cons/LISTTest.java b/src/test/function/builtin/cons/LISTTest.java
index 84c1de3..52b6975 100644
--- a/src/test/function/builtin/cons/LISTTest.java
+++ b/src/test/function/builtin/cons/LISTTest.java
@@ -57,5 +57,4 @@ public class LISTTest extends SymbolAndFunctionCleaner {
     public void staticMakeList() {
         assertSExpressionsMatch(parseString("(22)"), makeList(parseString("22")));
     }
-
 }
diff --git a/src/test/function/builtin/cons/RESTTest.java b/src/test/function/builtin/cons/RESTTest.java
index ffe983c..90dcf29 100644
--- a/src/test/function/builtin/cons/RESTTest.java
+++ b/src/test/function/builtin/cons/RESTTest.java
@@ -55,5 +55,4 @@ public class RESTTest extends SymbolAndFunctionCleaner {
     public void restWithTooFewArguments() {
         evaluateString("(rest)");
     }
-
 }
diff --git a/src/test/function/builtin/math/DIVIDETest.java b/src/test/function/builtin/math/DIVIDETest.java
index 92208e1..087ddc5 100644
--- a/src/test/function/builtin/math/DIVIDETest.java
+++ b/src/test/function/builtin/math/DIVIDETest.java
@@ -75,5 +75,4 @@ public class DIVIDETest extends SymbolAndFunctionCleaner {
     public void divideByZeroException_HasCorrectAttributes() {
         assertIsErrorWithMessage(new DivideByZeroException());
     }
-
 }
diff --git a/src/test/function/builtin/math/MINUSTest.java b/src/test/function/builtin/math/MINUSTest.java
index 8b8802b..41a2937 100644
--- a/src/test/function/builtin/math/MINUSTest.java
+++ b/src/test/function/builtin/math/MINUSTest.java
@@ -49,5 +49,4 @@ public class MINUSTest extends SymbolAndFunctionCleaner {
     public void minusWithTooFewArguments() {
         evaluateString("(-)");
     }
-
 }
diff --git a/src/test/function/builtin/math/MULTIPLYTest.java b/src/test/function/builtin/math/MULTIPLYTest.java
index 2a92dd6..c32fc6d 100644
--- a/src/test/function/builtin/math/MULTIPLYTest.java
+++ b/src/test/function/builtin/math/MULTIPLYTest.java
@@ -50,5 +50,4 @@ public class MULTIPLYTest extends SymbolAndFunctionCleaner {
     public void multiplyWithNonNumber() {
         evaluateString("(* 'a 'b)");
     }
-
 }
diff --git a/src/test/function/builtin/math/PLUSTest.java b/src/test/function/builtin/math/PLUSTest.java
index 33f56a7..47833f1 100644
--- a/src/test/function/builtin/math/PLUSTest.java
+++ b/src/test/function/builtin/math/PLUSTest.java
@@ -50,5 +50,4 @@ public class PLUSTest extends SymbolAndFunctionCleaner {
     public void plusWithNonNumber() {
         evaluateString("(+ 'a 'b)");
     }
-
 }
diff --git a/src/test/function/builtin/predicate/ATOMTest.java b/src/test/function/builtin/predicate/ATOMTest.java
index efd33b5..3e07bcf 100644
--- a/src/test/function/builtin/predicate/ATOMTest.java
+++ b/src/test/function/builtin/predicate/ATOMTest.java
@@ -36,5 +36,4 @@ public class ATOMTest extends SymbolAndFunctionCleaner {
     public void testApplyWithTooFewArguments() {
         evaluateString("(atom)");
     }
-
 }
diff --git a/src/test/function/builtin/predicate/EQTest.java b/src/test/function/builtin/predicate/EQTest.java
index 7ff7b3b..92b9318 100644
--- a/src/test/function/builtin/predicate/EQTest.java
+++ b/src/test/function/builtin/predicate/EQTest.java
@@ -110,5 +110,4 @@ public class EQTest extends SymbolAndFunctionCleaner {
     public void eqWithTooFewArguments() {
         evaluateString("(eq 'one)");
     }
-
 }
diff --git a/src/test/function/builtin/predicate/EQUALTest.java b/src/test/function/builtin/predicate/EQUALTest.java
index 0190836..7c537d5 100644
--- a/src/test/function/builtin/predicate/EQUALTest.java
+++ b/src/test/function/builtin/predicate/EQUALTest.java
@@ -112,5 +112,4 @@ public class EQUALTest extends SymbolAndFunctionCleaner {
     public void equalWithTooFewArguments() {
         evaluateString("(equal 1)");
     }
-
 }
diff --git a/src/test/function/builtin/predicate/GENSYM_EQUALTest.java b/src/test/function/builtin/predicate/GENSYM_EQUALTest.java
index 623b07a..fc85965 100644
--- a/src/test/function/builtin/predicate/GENSYM_EQUALTest.java
+++ b/src/test/function/builtin/predicate/GENSYM_EQUALTest.java
@@ -158,5 +158,4 @@ public class GENSYM_EQUALTest extends SymbolAndFunctionCleaner {
 
         assertNil(evaluateString(input));
     }
-
 }
diff --git a/src/test/function/builtin/predicate/LISTPTest.java b/src/test/function/builtin/predicate/LISTPTest.java
index f7dc56e..b06ebaf 100644
--- a/src/test/function/builtin/predicate/LISTPTest.java
+++ b/src/test/function/builtin/predicate/LISTPTest.java
@@ -36,5 +36,4 @@ public class LISTPTest extends SymbolAndFunctionCleaner {
     public void listpWithTooManyArguments() {
         evaluateString("(listp '() '())");
     }
-
 }
diff --git a/src/test/function/builtin/predicate/NULLTest.java b/src/test/function/builtin/predicate/NULLTest.java
index 128394e..29825c9 100644
--- a/src/test/function/builtin/predicate/NULLTest.java
+++ b/src/test/function/builtin/predicate/NULLTest.java
@@ -36,5 +36,4 @@ public class NULLTest extends SymbolAndFunctionCleaner {
     public void testNullWithTooManyArguments() {
         evaluateString("(null 1 2)");
     }
-
 }
diff --git a/src/test/function/builtin/predicate/NUMERIC_EQUALTest.java b/src/test/function/builtin/predicate/NUMERIC_EQUALTest.java
index 21bb8cc..69a5244 100644
--- a/src/test/function/builtin/predicate/NUMERIC_EQUALTest.java
+++ b/src/test/function/builtin/predicate/NUMERIC_EQUALTest.java
@@ -56,5 +56,4 @@ public class NUMERIC_EQUALTest extends SymbolAndFunctionCleaner {
     public void numericEqualWithTooFewArguments() {
         evaluateString("(=)");
     }
-
 }
diff --git a/src/test/function/builtin/predicate/NUMERIC_GREATERTest.java b/src/test/function/builtin/predicate/NUMERIC_GREATERTest.java
index 6867176..05ddda5 100644
--- a/src/test/function/builtin/predicate/NUMERIC_GREATERTest.java
+++ b/src/test/function/builtin/predicate/NUMERIC_GREATERTest.java
@@ -56,5 +56,4 @@ public class NUMERIC_GREATERTest extends SymbolAndFunctionCleaner {
     public void greaterThanWithTooFewArguments() {
         evaluateString("(>)");
     }
-
 }
diff --git a/src/test/function/builtin/predicate/NUMERIC_LESSTest.java b/src/test/function/builtin/predicate/NUMERIC_LESSTest.java
index 48d3e91..7721ef3 100644
--- a/src/test/function/builtin/predicate/NUMERIC_LESSTest.java
+++ b/src/test/function/builtin/predicate/NUMERIC_LESSTest.java
@@ -56,5 +56,4 @@ public class NUMERIC_LESSTest extends SymbolAndFunctionCleaner {
     public void lessThanWithTooFewArguments() {
         evaluateString("(<)");
     }
-
 }
diff --git a/src/test/function/builtin/special/ANDTest.java b/src/test/function/builtin/special/ANDTest.java
index d995e0e..42b2034 100644
--- a/src/test/function/builtin/special/ANDTest.java
+++ b/src/test/function/builtin/special/ANDTest.java
@@ -62,5 +62,4 @@ public class ANDTest extends SymbolAndFunctionCleaner {
         assertNil(evaluateString(input));
         evaluateString("x");
     }
-
 }
diff --git a/src/test/function/builtin/special/CASETest.java b/src/test/function/builtin/special/CASETest.java
index 5a8bb20..1b0c610 100644
--- a/src/test/function/builtin/special/CASETest.java
+++ b/src/test/function/builtin/special/CASETest.java
@@ -194,5 +194,4 @@ public class CASETest extends SymbolAndFunctionCleaner {
     public void caseWithNilClause() {
         evaluateString("(case :a nil)");
     }
-
 }
diff --git a/src/test/function/builtin/special/CONDTest.java b/src/test/function/builtin/special/CONDTest.java
index 84856b2..db0ef3e 100644
--- a/src/test/function/builtin/special/CONDTest.java
+++ b/src/test/function/builtin/special/CONDTest.java
@@ -94,5 +94,4 @@ public class CONDTest extends SymbolAndFunctionCleaner {
     public void condWithDottedArgumentList_ThrowsException() {
         evaluateString("(apply 'cond (cons '(nil T) 'b))");
     }
-
 }
diff --git a/src/test/function/builtin/special/DEFINE_SPECIALTest.java b/src/test/function/builtin/special/DEFINE_SPECIALTest.java
index 8b2fa9a..11953b5 100644
--- a/src/test/function/builtin/special/DEFINE_SPECIALTest.java
+++ b/src/test/function/builtin/special/DEFINE_SPECIALTest.java
@@ -186,5 +186,4 @@ public class DEFINE_SPECIALTest extends SymbolAndFunctionCleaner {
 
         assertSExpressionsMatch(parseString("grains"), evaluateString("x"));
     }
-
 }
diff --git a/src/test/function/builtin/special/DEFMACROTest.java b/src/test/function/builtin/special/DEFMACROTest.java
index b59eeba..f62d565 100644
--- a/src/test/function/builtin/special/DEFMACROTest.java
+++ b/src/test/function/builtin/special/DEFMACROTest.java
@@ -187,5 +187,4 @@ public class DEFMACROTest extends SymbolAndFunctionCleaner {
         evaluateString("(defmacro m (x) `'(+ 2 ,x))");
         assertSExpressionsMatch(parseString("(+ 2 25)"), evaluateString("(m 25)"));
     }
-
 }
diff --git a/src/test/function/builtin/special/DEFUNTest.java b/src/test/function/builtin/special/DEFUNTest.java
index ba7c68c..593099d 100644
--- a/src/test/function/builtin/special/DEFUNTest.java
+++ b/src/test/function/builtin/special/DEFUNTest.java
@@ -185,5 +185,4 @@ public class DEFUNTest extends SymbolAndFunctionCleaner {
 
         assertSExpressionsMatch(parseString("grains"), evaluateString("x"));
     }
-
 }
diff --git a/src/test/function/builtin/special/IFTest.java b/src/test/function/builtin/special/IFTest.java
index ac19398..478b3d0 100644
--- a/src/test/function/builtin/special/IFTest.java
+++ b/src/test/function/builtin/special/IFTest.java
@@ -73,5 +73,4 @@ public class IFTest extends SymbolAndFunctionCleaner {
     public void ifWithTooManyArguments() {
         evaluateString("(if t t t t)");
     }
-
 }
diff --git a/src/test/function/builtin/special/LAMBDATest.java b/src/test/function/builtin/special/LAMBDATest.java
index d7b4883..4cfd4fd 100644
--- a/src/test/function/builtin/special/LAMBDATest.java
+++ b/src/test/function/builtin/special/LAMBDATest.java
@@ -147,5 +147,4 @@ public class LAMBDATest extends SymbolAndFunctionCleaner {
         assertSExpressionsMatch(parseString("3"), evaluateString("(funcall increment-count)"));
         assertSExpressionsMatch(parseString("4"), evaluateString("(funcall increment-count)"));
     }
-
 }
diff --git a/src/test/function/builtin/special/LETTest.java b/src/test/function/builtin/special/LETTest.java
index 8646c05..728b6c6 100644
--- a/src/test/function/builtin/special/LETTest.java
+++ b/src/test/function/builtin/special/LETTest.java
@@ -157,5 +157,4 @@ public class LETTest extends SymbolAndFunctionCleaner {
 
         assertSExpressionsMatch(new LispNumber("2"), evaluateString(input));
     }
-
 }
diff --git a/src/test/function/builtin/special/LET_STARTest.java b/src/test/function/builtin/special/LET_STARTest.java
index e00a8d9..d6bf683 100644
--- a/src/test/function/builtin/special/LET_STARTest.java
+++ b/src/test/function/builtin/special/LET_STARTest.java
@@ -157,5 +157,4 @@ public class LET_STARTest extends SymbolAndFunctionCleaner {
 
         assertSExpressionsMatch(new LispNumber("3"), evaluateString(input));
     }
-
 }
diff --git a/src/test/function/builtin/special/ORTest.java b/src/test/function/builtin/special/ORTest.java
index 3e57073..33beb92 100644
--- a/src/test/function/builtin/special/ORTest.java
+++ b/src/test/function/builtin/special/ORTest.java
@@ -62,5 +62,4 @@ public class ORTest extends SymbolAndFunctionCleaner {
         assertT(evaluateString(input));
         evaluateString("x");
     }
-
 }
diff --git a/src/test/function/builtin/special/PROGNTest.java b/src/test/function/builtin/special/PROGNTest.java
index 88ed0c1..3ba03e5 100644
--- a/src/test/function/builtin/special/PROGNTest.java
+++ b/src/test/function/builtin/special/PROGNTest.java
@@ -40,5 +40,4 @@ public class PROGNTest extends SymbolAndFunctionCleaner {
     public void prognWithDifferentArgumentTypes() {
         assertSExpressionsMatch(parseString("pear"), evaluateString("(progn t nil '(1 2) 'pear)"));
     }
-
 }
diff --git a/src/test/function/builtin/special/QUOTETest.java b/src/test/function/builtin/special/QUOTETest.java
index e93ef55..7acbf40 100644
--- a/src/test/function/builtin/special/QUOTETest.java
+++ b/src/test/function/builtin/special/QUOTETest.java
@@ -35,5 +35,4 @@ public class QUOTETest extends SymbolAndFunctionCleaner {
     public void quoteWithTooManyArguments() {
         evaluateString("(quote a b)");
     }
-
 }
diff --git a/src/test/function/builtin/special/RECURTest.java b/src/test/function/builtin/special/RECURTest.java
index e4ed2e1..cd7fd5d 100644
--- a/src/test/function/builtin/special/RECURTest.java
+++ b/src/test/function/builtin/special/RECURTest.java
@@ -116,7 +116,8 @@ public class RECURTest extends SymbolAndFunctionCleaner {
         try {
             evaluateString("(bad-tail-recursive 900)");
             fail("expectedException");
-        } catch (RecurNotInTailPositionException e) {}
+        } catch (RecurNotInTailPositionException e) {
+        }
 
         assertSExpressionsMatch(parseString("PASS"), evaluateString("(tail-recursive 900)"));
     }
@@ -129,7 +130,8 @@ public class RECURTest extends SymbolAndFunctionCleaner {
         try {
             evaluateString("(bad-tail-recursive 900)");
             fail("expectedException");
-        } catch (RecurNotInTailPositionException e) {}
+        } catch (RecurNotInTailPositionException e) {
+        }
 
         assertSExpressionsMatch(parseString("PASS"), evaluateString("(tail-recursive 900)"));
     }
@@ -142,7 +144,8 @@ public class RECURTest extends SymbolAndFunctionCleaner {
         try {
             evaluateString("(bad-tail-recursive 900)");
             fail("expectedException");
-        } catch (NestedRecurException e) {}
+        } catch (NestedRecurException e) {
+        }
 
         assertSExpressionsMatch(parseString("PASS"), evaluateString("(tail-recursive 900)"));
     }
@@ -187,5 +190,4 @@ public class RECURTest extends SymbolAndFunctionCleaner {
     public void recurNotInTailPositionException_HasCorrectAttributes() {
         assertIsErrorWithMessage(new RecurNotInTailPositionException());
     }
-
 }
diff --git a/src/test/function/builtin/special/SETQTest.java b/src/test/function/builtin/special/SETQTest.java
index 90aad00..f09f243 100644
--- a/src/test/function/builtin/special/SETQTest.java
+++ b/src/test/function/builtin/special/SETQTest.java
@@ -92,5 +92,4 @@ public class SETQTest extends SymbolAndFunctionCleaner {
     public void setqWithTooManyArguments() {
         evaluateString("(setq a b c)");
     }
-
 }
diff --git a/src/test/interpreter/LispInterpreterTest.java b/src/test/interpreter/LispInterpreterTest.java
index 913d28a..9a69064 100644
--- a/src/test/interpreter/LispInterpreterTest.java
+++ b/src/test/interpreter/LispInterpreterTest.java
@@ -193,5 +193,4 @@ public class LispInterpreterTest {
         assertEquals("\n", outputStream.toString());
         assertEquals("[error] symbol PICKLE has no value\n", errorOutputStream.toString());
     }
-
 }
diff --git a/src/test/parser/LispParserTest.java b/src/test/parser/LispParserTest.java
index 945f9e7..ec47957 100644
--- a/src/test/parser/LispParserTest.java
+++ b/src/test/parser/LispParserTest.java
@@ -304,7 +304,8 @@ public class LispParserTest {
         try {
             parser.getNextSExpression();
             fail("Expected LispException");
-        } catch (LispException e) {}
+        } catch (LispException e) {
+        }
 
         assertTrue(parser.isEof());
     }
@@ -378,5 +379,4 @@ public class LispParserTest {
         assertAtSignExpression(parser.getNextSExpression());
         assertTrue(parser.isEof());
     }
-
 }
diff --git a/src/test/recursion/TailCallTest.java b/src/test/recursion/TailCallTest.java
index c192067..b3a9466 100644
--- a/src/test/recursion/TailCallTest.java
+++ b/src/test/recursion/TailCallTest.java
@@ -28,5 +28,4 @@ public class TailCallTest {
     public void TailCallsCoverage() {
         new TailCalls();
     }
-
 }
diff --git a/src/test/scanner/LispCommentRemovingInputStreamTest.java b/src/test/scanner/LispCommentRemovingInputStreamTest.java
index 7d4d6e7..60150cb 100644
--- a/src/test/scanner/LispCommentRemovingInputStreamTest.java
+++ b/src/test/scanner/LispCommentRemovingInputStreamTest.java
@@ -226,5 +226,4 @@ public class LispCommentRemovingInputStreamTest {
 
         assertEquals(expectedResult, getLispCommentRemovingInputStreamResult(input));
     }
-
 }
diff --git a/src/test/scanner/LispScannerLineColumnTest.java b/src/test/scanner/LispScannerLineColumnTest.java
index 78d55b8..0bba8dd 100644
--- a/src/test/scanner/LispScannerLineColumnTest.java
+++ b/src/test/scanner/LispScannerLineColumnTest.java
@@ -134,5 +134,4 @@ public class LispScannerLineColumnTest {
 
         assertTokenLineAndColumnsMatch(input, expectedLinesAndColumns);
     }
-
 }
diff --git a/src/test/scanner/LispScannerTextTest.java b/src/test/scanner/LispScannerTextTest.java
index 42ab768..11c9344 100644
--- a/src/test/scanner/LispScannerTextTest.java
+++ b/src/test/scanner/LispScannerTextTest.java
@@ -114,5 +114,4 @@ public class LispScannerTextTest {
 
         assertTokenTextMatches(input, expected);
     }
-
 }
diff --git a/src/test/scanner/LispScannerTypeTest.java b/src/test/scanner/LispScannerTypeTest.java
index 58078d7..4365913 100644
--- a/src/test/scanner/LispScannerTypeTest.java
+++ b/src/test/scanner/LispScannerTypeTest.java
@@ -306,5 +306,4 @@ public class LispScannerTypeTest {
 
         assertTokenTypesMatch(input);
     }
-
 }
diff --git a/src/test/sexpression/SExpressionTest.java b/src/test/sexpression/SExpressionTest.java
index 49be3a6..8d08874 100644
--- a/src/test/sexpression/SExpressionTest.java
+++ b/src/test/sexpression/SExpressionTest.java
@@ -221,5 +221,4 @@ public class SExpressionTest {
 
         assertSExpressionsMatch(expression, atSign.getExpression());
     }
-
 }
diff --git a/src/test/stream/SafeInputStreamTest.java b/src/test/stream/SafeInputStreamTest.java
index 4be1d9c..e20c378 100644
--- a/src/test/stream/SafeInputStreamTest.java
+++ b/src/test/stream/SafeInputStreamTest.java
@@ -38,5 +38,4 @@ public class SafeInputStreamTest {
     public void closeThrowsUncheckedException() {
         safeWithException.close();
     }
-
 }
diff --git a/src/test/stream/SafeOutputStreamTest.java b/src/test/stream/SafeOutputStreamTest.java
index 1fc4269..c181691 100644
--- a/src/test/stream/SafeOutputStreamTest.java
+++ b/src/test/stream/SafeOutputStreamTest.java
@@ -51,5 +51,4 @@ public class SafeOutputStreamTest {
     public void closeThrowsUncheckedException() {
         safeWithException.close();
     }
-
 }
diff --git a/src/test/table/ExecutionContextTest.java b/src/test/table/ExecutionContextTest.java
index 9dacbfc..068dbe4 100644
--- a/src/test/table/ExecutionContextTest.java
+++ b/src/test/table/ExecutionContextTest.java
@@ -99,5 +99,4 @@ public class ExecutionContextTest {
         assertThat(executionContext.getScope().isGlobal(), is(true));
         assertThat(executionContext.getScope(), is(global));
     }
-
 }
diff --git a/src/test/table/FunctionTableTest.java b/src/test/table/FunctionTableTest.java
index 254d023..ec1aec0 100644
--- a/src/test/table/FunctionTableTest.java
+++ b/src/test/table/FunctionTableTest.java
@@ -160,5 +160,4 @@ public class FunctionTableTest {
         assertFalse(isAlreadyDefined("UGLY"));
         assertNull(lookupFunction("UGLY"));
     }
-
 }
diff --git a/src/test/table/SymbolTableTest.java b/src/test/table/SymbolTableTest.java
index 778ed9a..444585a 100644
--- a/src/test/table/SymbolTableTest.java
+++ b/src/test/table/SymbolTableTest.java
@@ -60,5 +60,4 @@ public class SymbolTableTest {
 
         assertEquals(T, parentTable.get("symbol"));
     }
-
 }
diff --git a/src/test/terminal/ControlSequenceHandlerTest.java b/src/test/terminal/ControlSequenceHandlerTest.java
index df29227..ec40094 100644
--- a/src/test/terminal/ControlSequenceHandlerTest.java
+++ b/src/test/terminal/ControlSequenceHandlerTest.java
@@ -132,5 +132,4 @@ public class ControlSequenceHandlerTest {
         assertThat(handler.parse(input), is(GREEN));
         assertThat(handler.parse(input), is(RESET));
     }
-
 }
diff --git a/src/test/terminal/ControlSequenceTest.java b/src/test/terminal/ControlSequenceTest.java
index f99132d..d24a195 100644
--- a/src/test/terminal/ControlSequenceTest.java
+++ b/src/test/terminal/ControlSequenceTest.java
@@ -100,5 +100,4 @@ public class ControlSequenceTest {
         for (SelectGraphicRendition sgr : SelectGraphicRendition.values())
             SelectGraphicRendition.valueOf(sgr.toString());
     }
-
 }
diff --git a/src/test/terminal/FlushListener.java b/src/test/terminal/FlushListener.java
index 8d7c377..7e85885 100644
--- a/src/test/terminal/FlushListener.java
+++ b/src/test/terminal/FlushListener.java
@@ -34,5 +34,4 @@ public class FlushListener implements VirtualTerminalListener {
 
     @Override
     public void onClose() {}
-
 }
\ No newline at end of file
diff --git a/src/test/terminal/LispTerminalTest.java b/src/test/terminal/LispTerminalTest.java
index 2892d36..d4c3d5d 100644
--- a/src/test/terminal/LispTerminalTest.java
+++ b/src/test/terminal/LispTerminalTest.java
@@ -491,5 +491,4 @@ public class LispTerminalTest {
         terminal.assertScreenText(" ");
         terminal.assertCursorPosition(0, 0);
     }
-
 }
diff --git a/src/test/terminal/TerminalConfigurationTest.java b/src/test/terminal/TerminalConfigurationTest.java
index 9da9f08..6909c05 100644
--- a/src/test/terminal/TerminalConfigurationTest.java
+++ b/src/test/terminal/TerminalConfigurationTest.java
@@ -37,5 +37,4 @@ public class TerminalConfigurationTest {
     public void setOutputPairThrowsUncheckedException() {
         configuration.setOutputPair(createIOExceptionThrowingPipedOutputStream(), new PipedInputStream());
     }
-
 }
diff --git a/src/test/terminal/TerminalHistoryTest.java b/src/test/terminal/TerminalHistoryTest.java
index 784d4b0..dae6410 100644
--- a/src/test/terminal/TerminalHistoryTest.java
+++ b/src/test/terminal/TerminalHistoryTest.java
@@ -136,5 +136,4 @@ public class TerminalHistoryTest {
 
         assertNext("current");
     }
-
 }
diff --git a/src/test/terminal/VirtualTerminalInteractor.java b/src/test/terminal/VirtualTerminalInteractor.java
index fac6c91..f605cd5 100644
--- a/src/test/terminal/VirtualTerminalInteractor.java
+++ b/src/test/terminal/VirtualTerminalInteractor.java
@@ -108,7 +108,8 @@ public class VirtualTerminalInteractor {
             outputWriter.write(END_OF_SEGMENT);
             outputWriter.flush();
             waitForFlushes(1);
-        } catch (IOException ignored) {}
+        } catch (IOException ignored) {
+        }
     }
 
     public void waitForFlushes(int flushCount) {
@@ -119,7 +120,8 @@ public class VirtualTerminalInteractor {
 
                 flushListener.reduceFlushCount(flushCount);
             }
-        } catch (InterruptedException ignored) {}
+        } catch (InterruptedException ignored) {
+        }
     }
 
     public void waitForPrompt() {
@@ -162,7 +164,8 @@ public class VirtualTerminalInteractor {
 
             for (int c = inputReader.read(); c != -1; c = inputReader.read())
                 actual += (char) c;
-        } catch (IOException ignored) {}
+        } catch (IOException ignored) {
+        }
 
         assertThat(actual, is(expected));
     }
@@ -171,7 +174,7 @@ public class VirtualTerminalInteractor {
         try {
             inputWriter.write(0);
             fail("input stream not closed");
-        } catch (IOException ignored) {}
+        } catch (IOException ignored) {
+        }
     }
-
 }
diff --git a/src/test/testutil/SymbolAndFunctionCleaner.java b/src/test/testutil/SymbolAndFunctionCleaner.java
index 3181ea0..e04e4cf 100644
--- a/src/test/testutil/SymbolAndFunctionCleaner.java
+++ b/src/test/testutil/SymbolAndFunctionCleaner.java
@@ -32,5 +32,4 @@ public abstract class SymbolAndFunctionCleaner {
     public void additionalSetUp() {}
 
     public void additionalTearDown() {}
-
 }
diff --git a/src/test/testutil/TestUtilities.java b/src/test/testutil/TestUtilities.java
index fd833d6..8ba750a 100644
--- a/src/test/testutil/TestUtilities.java
+++ b/src/test/testutil/TestUtilities.java
@@ -96,5 +96,4 @@ public final class TestUtilities {
         assertThat(e.getSeverity(), is(ERROR));
         assertThat(e.getMessage(), not(isEmptyOrNullString()));
     }
-
 }
diff --git a/src/test/testutil/TypeAssertions.java b/src/test/testutil/TypeAssertions.java
index c18bc7c..3dc5bf9 100644
--- a/src/test/testutil/TypeAssertions.java
+++ b/src/test/testutil/TypeAssertions.java
@@ -126,5 +126,4 @@ public final class TypeAssertions {
         assertThat(sExpression.isComma(), is(false));
         assertThat(sExpression.isAtSign(), is(true));
     }
-
 }
diff --git a/src/test/token/TokenFactoryTest.java b/src/test/token/TokenFactoryTest.java
index 1bdad5f..b7bd7fe 100644
--- a/src/test/token/TokenFactoryTest.java
+++ b/src/test/token/TokenFactoryTest.java
@@ -123,5 +123,4 @@ public class TokenFactoryTest {
         String text = "@";
         assertThat(createToken(text), instanceOf(AtSign.class));
     }
-
 }
diff --git a/src/test/util/CharactersTest.java b/src/test/util/CharactersTest.java
index 948226d..fd5338a 100644
--- a/src/test/util/CharactersTest.java
+++ b/src/test/util/CharactersTest.java
@@ -18,5 +18,4 @@ public class CharactersTest {
         constructor.setAccessible(true);
         constructor.newInstance();
     }
-
 }
diff --git a/src/test/util/PathTest.java b/src/test/util/PathTest.java
index b97b74b..5b16a5c 100644
--- a/src/test/util/PathTest.java
+++ b/src/test/util/PathTest.java
@@ -18,5 +18,4 @@ public class PathTest {
         constructor.setAccessible(true);
         constructor.newInstance();
     }
-
 }