Remove wildcard imports

src/environment/RuntimeEnvironment.java

@@ -1,6 +1,7 @@
 package environment;
 
-import java.io.*;
+import java.io.InputStream;
+import java.io.PrintStream;
 import java.util.function.Function;
 
 import error.ErrorManager;

src/error/ErrorManager.java

@@ -1,6 +1,7 @@
 package error;
 
-import static error.ErrorManager.Severity.*;
+import static error.ErrorManager.Severity.CRITICAL;
+import static error.ErrorManager.Severity.WARNING;
 import static java.text.MessageFormat.format;
 
 import java.io.PrintStream;

src/function/ArgumentValidator.java

@@ -6,7 +6,9 @@ import static java.text.MessageFormat.format;
 import java.math.BigInteger;
 
 import error.LispException;
-import sexpression.*;
+import sexpression.Cons;
+import sexpression.DisplayName;
+import sexpression.SExpression;
 
 public class ArgumentValidator {
 

src/function/FunctionNames.java

@@ -1,6 +1,9 @@
 package function;
 
-import java.lang.annotation.*;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)

src/function/LispFunction.java

@@ -1,6 +1,7 @@
 package function;
 
-import sexpression.*;
+import sexpression.Cons;
+import sexpression.SExpression;
 
 public abstract class LispFunction {
 

src/function/UserDefinedFunction.java

@@ -7,8 +7,11 @@ import static sexpression.Nil.NIL;
 import java.util.ArrayList;
 
 import error.LispException;
-import sexpression.*;
-import table.*;
+import sexpression.Cons;
+import sexpression.SExpression;
+import sexpression.Symbol;
+import table.ExecutionContext;
+import table.SymbolTable;
 
 public class UserDefinedFunction extends LispFunction {
 

src/function/builtin/APPLY.java

@@ -3,8 +3,11 @@ package function.builtin;
 import static function.builtin.EVAL.lookupFunctionOrLambda;
 import static table.FunctionTable.lookupFunction;
 
-import function.*;
-import sexpression.*;
+import function.ArgumentValidator;
+import function.FunctionNames;
+import function.LispFunction;
+import sexpression.Cons;
+import sexpression.SExpression;
 
 @FunctionNames({ "APPLY" })
 public class APPLY extends LispFunction {

src/function/builtin/BackquoteEvaluator.java

@@ -5,7 +5,11 @@ import static sexpression.Nil.NIL;
 
 import error.LispException;
 import function.ArgumentValidator;
-import sexpression.*;
+import sexpression.AtSignExpression;
+import sexpression.BackquoteExpression;
+import sexpression.CommaExpression;
+import sexpression.Cons;
+import sexpression.SExpression;
 
 class BackquoteEvaluator {
 

src/function/builtin/EVAL.java

@@ -1,15 +1,22 @@
 package function.builtin;
 
 import static function.builtin.cons.LIST.makeList;
-import static function.builtin.special.LAMBDA.*;
+import static function.builtin.special.LAMBDA.createFunction;
+import static function.builtin.special.LAMBDA.isLambdaExpression;
 import static java.text.MessageFormat.format;
 import static sexpression.Nil.NIL;
 import static sexpression.Symbol.T;
 import static table.FunctionTable.lookupFunction;
 
 import error.LispException;
-import function.*;
-import sexpression.*;
+import function.ArgumentValidator;
+import function.FunctionNames;
+import function.LispFunction;
+import sexpression.BackquoteExpression;
+import sexpression.Cons;
+import sexpression.LambdaExpression;
+import sexpression.SExpression;
+import sexpression.Symbol;
 import table.ExecutionContext;
 
 @FunctionNames({ "EVAL" })

src/function/builtin/EXIT.java

@@ -3,8 +3,11 @@ package function.builtin;
 import static sexpression.Nil.NIL;
 
 import environment.RuntimeEnvironment;
-import function.*;
-import sexpression.*;
+import function.ArgumentValidator;
+import function.FunctionNames;
+import function.LispFunction;
+import sexpression.Cons;
+import sexpression.SExpression;
 
 @FunctionNames({ "EXIT" })
 public class EXIT extends LispFunction {

src/function/builtin/FUNCALL.java

@@ -3,8 +3,11 @@ package function.builtin;
 import static function.builtin.APPLY.apply;
 import static function.builtin.cons.LIST.makeList;
 
-import function.*;
-import sexpression.*;
+import function.ArgumentValidator;
+import function.FunctionNames;
+import function.LispFunction;
+import sexpression.Cons;
+import sexpression.SExpression;
 
 @FunctionNames({ "FUNCALL", "CALL" })
 public class FUNCALL extends LispFunction {

src/function/builtin/GENSYM.java

@@ -2,8 +2,12 @@ package function.builtin;
 
 import java.math.BigInteger;
 
-import function.*;
-import sexpression.*;
+import function.ArgumentValidator;
+import function.FunctionNames;
+import function.LispFunction;
+import sexpression.Cons;
+import sexpression.SExpression;
+import sexpression.Symbol;
 
 @FunctionNames({ "GENSYM" })
 public class GENSYM extends LispFunction {

src/function/builtin/LOAD.java

@@ -6,14 +6,20 @@ import static sexpression.Nil.NIL;
 import static sexpression.Symbol.T;
 import static util.Path.getPathPrefix;
 
-import java.io.*;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.util.Stack;
 
 import environment.RuntimeEnvironment;
-import error.*;
-import function.*;
+import error.LispException;
+import error.LispWarning;
+import function.ArgumentValidator;
+import function.FunctionNames;
+import function.LispFunction;
 import parser.LispParser;
-import sexpression.*;
+import sexpression.Cons;
+import sexpression.LispString;
+import sexpression.SExpression;
 
 @FunctionNames({ "LOAD" })
 public class LOAD extends LispFunction {

src/function/builtin/PRINT.java

@@ -1,8 +1,11 @@
 package function.builtin;
 
 import environment.RuntimeEnvironment;
-import function.*;
-import sexpression.*;
+import function.ArgumentValidator;
+import function.FunctionNames;
+import function.LispFunction;
+import sexpression.Cons;
+import sexpression.SExpression;
 
 @FunctionNames({ "PRINT" })
 public class PRINT extends LispFunction {

src/function/builtin/SET.java

@@ -2,9 +2,14 @@ package function.builtin;
 
 import static table.FunctionTable.lookupFunction;
 
-import function.*;
-import sexpression.*;
-import table.*;
+import function.ArgumentValidator;
+import function.FunctionNames;
+import function.LispFunction;
+import sexpression.Cons;
+import sexpression.SExpression;
+import sexpression.Symbol;
+import table.ExecutionContext;
+import table.SymbolTable;
 
 @FunctionNames({ "SET" })
 public class SET extends LispFunction {

src/function/builtin/SYMBOL_FUNCTION.java

@@ -4,8 +4,14 @@ import static java.text.MessageFormat.format;
 import static table.FunctionTable.lookupFunction;
 
 import error.LispException;
-import function.*;
-import sexpression.*;
+import function.ArgumentValidator;
+import function.FunctionNames;
+import function.LispFunction;
+import function.LispSpecialFunction;
+import function.UserDefinedFunction;
+import sexpression.Cons;
+import sexpression.SExpression;
+import sexpression.Symbol;
 
 @FunctionNames({ "SYMBOL-FUNCTION" })
 public class SYMBOL_FUNCTION extends LispFunction {

src/function/builtin/cons/CONS.java

@@ -1,7 +1,10 @@
 package function.builtin.cons;
 
-import function.*;
-import sexpression.*;
+import function.ArgumentValidator;
+import function.FunctionNames;
+import function.LispFunction;
+import sexpression.Cons;
+import sexpression.SExpression;
 
 @FunctionNames({ "CONS" })
 public class CONS extends LispFunction {

src/function/builtin/cons/FIRST.java

@@ -1,7 +1,10 @@
 package function.builtin.cons;
 
-import function.*;
-import sexpression.*;
+import function.ArgumentValidator;
+import function.FunctionNames;
+import function.LispFunction;
+import sexpression.Cons;
+import sexpression.SExpression;
 
 @FunctionNames({ "FIRST", "CAR" })
 public class FIRST extends LispFunction {

src/function/builtin/cons/LENGTH.java

@@ -4,8 +4,11 @@ import static function.builtin.cons.LIST.makeList;
 
 import java.math.BigInteger;
 
-import function.*;
-import sexpression.*;
+import function.ArgumentValidator;
+import function.FunctionNames;
+import function.LispFunction;
+import sexpression.Cons;
+import sexpression.LispNumber;
 
 @FunctionNames({ "LENGTH" })
 public class LENGTH extends LispFunction {

src/function/builtin/cons/LIST.java

@@ -2,8 +2,11 @@ package function.builtin.cons;
 
 import static sexpression.Nil.NIL;
 
-import function.*;
-import sexpression.*;
+import function.ArgumentValidator;
+import function.FunctionNames;
+import function.LispFunction;
+import sexpression.Cons;
+import sexpression.SExpression;
 
 @FunctionNames({ "LIST" })
 public class LIST extends LispFunction {

src/function/builtin/cons/REST.java

@@ -1,7 +1,10 @@
 package function.builtin.cons;
 
-import function.*;
-import sexpression.*;
+import function.ArgumentValidator;
+import function.FunctionNames;
+import function.LispFunction;
+import sexpression.Cons;
+import sexpression.SExpression;
 
 @FunctionNames({ "REST", "CDR" })
 public class REST extends LispFunction {

src/function/builtin/math/DIVIDE.java

@@ -2,8 +2,11 @@ package function.builtin.math;
 
 import java.math.BigInteger;
 
-import function.*;
-import sexpression.*;
+import function.ArgumentValidator;
+import function.FunctionNames;
+import function.LispFunction;
+import sexpression.Cons;
+import sexpression.LispNumber;
 
 @FunctionNames({ "/" })
 public class DIVIDE extends LispFunction {

src/function/builtin/math/MINUS.java

@@ -2,8 +2,11 @@ package function.builtin.math;
 
 import java.math.BigInteger;
 
-import function.*;
-import sexpression.*;
+import function.ArgumentValidator;
+import function.FunctionNames;
+import function.LispFunction;
+import sexpression.Cons;
+import sexpression.LispNumber;
 
 @FunctionNames({ "-" })
 public class MINUS extends LispFunction {

src/function/builtin/math/MULTIPLY.java

@@ -2,8 +2,11 @@ package function.builtin.math;
 
 import static sexpression.LispNumber.ONE;
 
-import function.*;
-import sexpression.*;
+import function.ArgumentValidator;
+import function.FunctionNames;
+import function.LispFunction;
+import sexpression.Cons;
+import sexpression.LispNumber;
 
 @FunctionNames({ "*" })
 public class MULTIPLY extends LispFunction {

src/function/builtin/math/MathFunction.java

@@ -1,8 +1,11 @@
 package function.builtin.math;
 
-import java.util.function.*;
+import java.util.function.BiFunction;
+import java.util.function.Function;
 
-import sexpression.*;
+import sexpression.Cons;
+import sexpression.LispNumber;
+import sexpression.SExpression;
 
 class MathFunction {
 

src/function/builtin/math/PLUS.java

@@ -2,8 +2,11 @@ package function.builtin.math;
 
 import static sexpression.LispNumber.ZERO;
 
-import function.*;
-import sexpression.*;
+import function.ArgumentValidator;
+import function.FunctionNames;
+import function.LispFunction;
+import sexpression.Cons;
+import sexpression.LispNumber;
 
 @FunctionNames({ "+" })
 public class PLUS extends LispFunction {

src/function/builtin/predicate/ATOM.java

@@ -3,8 +3,11 @@ package function.builtin.predicate;
 import static sexpression.Nil.NIL;
 import static sexpression.Symbol.T;
 
-import function.*;
-import sexpression.*;
+import function.ArgumentValidator;
+import function.FunctionNames;
+import function.LispFunction;
+import sexpression.Cons;
+import sexpression.SExpression;
 
 @FunctionNames({ "ATOM", "ATOM?" })
 public class ATOM extends LispFunction {

src/function/builtin/predicate/EQ.java

@@ -3,8 +3,11 @@ package function.builtin.predicate;
 import static sexpression.Nil.NIL;
 import static sexpression.Symbol.T;
 
-import function.*;
-import sexpression.*;
+import function.ArgumentValidator;
+import function.FunctionNames;
+import function.LispFunction;
+import sexpression.Cons;
+import sexpression.SExpression;
 
 @FunctionNames({ "EQ", "EQ?" })
 public class EQ extends LispFunction {

src/function/builtin/predicate/EQUAL.java

@@ -3,8 +3,11 @@ package function.builtin.predicate;
 import static sexpression.Nil.NIL;
 import static sexpression.Symbol.T;
 
-import function.*;
-import sexpression.*;
+import function.ArgumentValidator;
+import function.FunctionNames;
+import function.LispFunction;
+import sexpression.Cons;
+import sexpression.SExpression;
 
 @FunctionNames({ "EQUAL", "EQUAL?" })
 public class EQUAL extends LispFunction {

src/function/builtin/predicate/GENSYM_EQUAL.java

@@ -4,12 +4,17 @@ import static function.builtin.GENSYM.GENSYM_PREFIX;
 import static sexpression.Nil.NIL;
 import static sexpression.Symbol.T;
 
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Map.Entry;
-import java.util.regex.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
-import function.*;
-import sexpression.*;
+import function.ArgumentValidator;
+import function.FunctionNames;
+import function.LispFunction;
+import sexpression.Cons;
+import sexpression.SExpression;
 
 @FunctionNames({ "GENSYM-EQUAL", "GENSYM-EQUAL?" })
 public class GENSYM_EQUAL extends LispFunction {

src/function/builtin/predicate/LISTP.java

@@ -3,8 +3,11 @@ package function.builtin.predicate;
 import static sexpression.Nil.NIL;
 import static sexpression.Symbol.T;
 
-import function.*;
-import sexpression.*;
+import function.ArgumentValidator;
+import function.FunctionNames;
+import function.LispFunction;
+import sexpression.Cons;
+import sexpression.SExpression;
 
 @FunctionNames({ "LISTP", "LIST?" })
 public class LISTP extends LispFunction {

src/function/builtin/predicate/NULL.java

@@ -3,8 +3,11 @@ package function.builtin.predicate;
 import static sexpression.Nil.NIL;
 import static sexpression.Symbol.T;
 
-import function.*;
-import sexpression.*;
+import function.ArgumentValidator;
+import function.FunctionNames;
+import function.LispFunction;
+import sexpression.Cons;
+import sexpression.SExpression;
 
 @FunctionNames({ "NULL", "NULL?" })
 public class NULL extends LispFunction {

src/function/builtin/predicate/NUMERIC_EQUAL.java

@@ -3,8 +3,12 @@ package function.builtin.predicate;
 import static sexpression.Nil.NIL;
 import static sexpression.Symbol.T;
 
-import function.*;
-import sexpression.*;
+import function.ArgumentValidator;
+import function.FunctionNames;
+import function.LispFunction;
+import sexpression.Cons;
+import sexpression.LispNumber;
+import sexpression.SExpression;
 
 @FunctionNames({ "=" })
 public class NUMERIC_EQUAL extends LispFunction {

src/function/builtin/predicate/NUMERIC_GREATER.java

@@ -3,8 +3,12 @@ package function.builtin.predicate;
 import static sexpression.Nil.NIL;
 import static sexpression.Symbol.T;
 
-import function.*;
-import sexpression.*;
+import function.ArgumentValidator;
+import function.FunctionNames;
+import function.LispFunction;
+import sexpression.Cons;
+import sexpression.LispNumber;
+import sexpression.SExpression;
 
 @FunctionNames({ ">" })
 public class NUMERIC_GREATER extends LispFunction {

src/function/builtin/predicate/NUMERIC_LESS.java

@@ -3,8 +3,12 @@ package function.builtin.predicate;
 import static sexpression.Nil.NIL;
 import static sexpression.Symbol.T;
 
-import function.*;
-import sexpression.*;
+import function.ArgumentValidator;
+import function.FunctionNames;
+import function.LispFunction;
+import sexpression.Cons;
+import sexpression.LispNumber;
+import sexpression.SExpression;
 
 @FunctionNames({ "<" })
 public class NUMERIC_LESS extends LispFunction {

src/function/builtin/special/AND.java

@@ -3,8 +3,11 @@ package function.builtin.special;
 import static function.builtin.EVAL.eval;
 import static sexpression.Symbol.T;
 
-import function.*;
-import sexpression.*;
+import function.ArgumentValidator;
+import function.FunctionNames;
+import function.LispSpecialFunction;
+import sexpression.Cons;
+import sexpression.SExpression;
 
 @FunctionNames({ "AND" })
 public class AND extends LispSpecialFunction {

src/function/builtin/special/CASE.java

@@ -5,8 +5,12 @@ import static function.builtin.predicate.EQUAL.isEqual;
 import static sexpression.Nil.NIL;
 import static sexpression.Symbol.T;
 
-import function.*;
-import sexpression.*;
+import function.ArgumentValidator;
+import function.FunctionNames;
+import function.LispSpecialFunction;
+import sexpression.Cons;
+import sexpression.Nil;
+import sexpression.SExpression;
 
 @FunctionNames({ "CASE" })
 public class CASE extends LispSpecialFunction {

src/function/builtin/special/COND.java

@@ -3,8 +3,12 @@ package function.builtin.special;
 import static function.builtin.EVAL.eval;
 import static sexpression.Nil.NIL;
 
-import function.*;
-import sexpression.*;
+import function.ArgumentValidator;
+import function.FunctionNames;
+import function.LispSpecialFunction;
+import sexpression.Cons;
+import sexpression.Nil;
+import sexpression.SExpression;
 
 @FunctionNames({ "COND" })
 public class COND extends LispSpecialFunction {

src/function/builtin/special/DEFINE_SPECIAL.java

@@ -1,7 +1,10 @@
 package function.builtin.special;
 
-import function.*;
-import sexpression.*;
+import function.FunctionNames;
+import function.UserDefinedFunction;
+import function.UserDefinedSpecialFunction;
+import sexpression.Cons;
+import sexpression.SExpression;
 
 @FunctionNames({ "DEFINE-SPECIAL" })
 public class DEFINE_SPECIAL extends Define {

src/function/builtin/special/DEFMACRO.java

@@ -1,7 +1,10 @@
 package function.builtin.special;
 
-import function.*;
-import sexpression.*;
+import function.FunctionNames;
+import function.UserDefinedFunction;
+import function.UserDefinedMacro;
+import sexpression.Cons;
+import sexpression.SExpression;
 
 @FunctionNames({ "DEFMACRO" })
 public class DEFMACRO extends Define {

src/function/builtin/special/DEFUN.java

@@ -1,7 +1,9 @@
 package function.builtin.special;
 
-import function.*;
-import sexpression.*;
+import function.FunctionNames;
+import function.UserDefinedFunction;
+import sexpression.Cons;
+import sexpression.SExpression;
 
 @FunctionNames({ "DEFUN" })
 public class DEFUN extends Define {

src/function/builtin/special/Define.java

@@ -2,12 +2,17 @@ package function.builtin.special;
 
 import static function.builtin.cons.LIST.makeList;
 import static java.text.MessageFormat.format;
-import static table.FunctionTable.*;
+import static table.FunctionTable.defineFunction;
+import static table.FunctionTable.isAlreadyDefined;
 
 import environment.RuntimeEnvironment;
 import error.LispWarning;
-import function.*;
-import sexpression.*;
+import function.ArgumentValidator;
+import function.LispSpecialFunction;
+import function.UserDefinedFunction;
+import sexpression.Cons;
+import sexpression.SExpression;
+import sexpression.Symbol;
 
 public abstract class Define extends LispSpecialFunction {
 

src/function/builtin/special/IF.java

@@ -2,8 +2,11 @@ package function.builtin.special;
 
 import static function.builtin.EVAL.eval;
 
-import function.*;
-import sexpression.*;
+import function.ArgumentValidator;
+import function.FunctionNames;
+import function.LispSpecialFunction;
+import sexpression.Cons;
+import sexpression.SExpression;
 
 @FunctionNames({ "IF" })
 public class IF extends LispSpecialFunction {

src/function/builtin/special/LAMBDA.java

@@ -2,8 +2,14 @@ package function.builtin.special;
 
 import static function.builtin.cons.LIST.makeList;
 
-import function.*;
-import sexpression.*;
+import function.ArgumentValidator;
+import function.FunctionNames;
+import function.LispSpecialFunction;
+import function.UserDefinedFunction;
+import sexpression.Cons;
+import sexpression.LambdaExpression;
+import sexpression.SExpression;
+import sexpression.Symbol;
 
 @FunctionNames({ "LAMBDA" })
 public class LAMBDA extends LispSpecialFunction {

src/function/builtin/special/LET.java

@@ -3,9 +3,14 @@ package function.builtin.special;
 import static function.builtin.EVAL.eval;
 import static sexpression.Nil.NIL;
 
-import function.*;
-import sexpression.*;
-import table.*;
+import function.ArgumentValidator;
+import function.FunctionNames;
+import function.LispSpecialFunction;
+import sexpression.Cons;
+import sexpression.SExpression;
+import sexpression.Symbol;
+import table.ExecutionContext;
+import table.SymbolTable;
 
 @FunctionNames({ "LET" })
 public class LET extends LispSpecialFunction {

src/function/builtin/special/OR.java

@@ -2,8 +2,11 @@ package function.builtin.special;
 
 import static function.builtin.EVAL.eval;
 
-import function.*;
-import sexpression.*;
+import function.ArgumentValidator;
+import function.FunctionNames;
+import function.LispSpecialFunction;
+import sexpression.Cons;
+import sexpression.SExpression;
 
 @FunctionNames({ "OR" })
 public class OR extends LispSpecialFunction {

src/function/builtin/special/PROGN.java

@@ -3,8 +3,11 @@ package function.builtin.special;
 import static function.builtin.EVAL.eval;
 import static sexpression.Nil.NIL;
 
-import function.*;
-import sexpression.*;
+import function.ArgumentValidator;
+import function.FunctionNames;
+import function.LispSpecialFunction;
+import sexpression.Cons;
+import sexpression.SExpression;
 
 @FunctionNames({ "PROGN", "BEGIN" })
 public class PROGN extends LispSpecialFunction {

src/function/builtin/special/QUOTE.java

@@ -1,7 +1,10 @@
 package function.builtin.special;
 
-import function.*;
-import sexpression.*;
+import function.ArgumentValidator;
+import function.FunctionNames;
+import function.LispSpecialFunction;
+import sexpression.Cons;
+import sexpression.SExpression;
 
 @FunctionNames({ "QUOTE" })
 public class QUOTE extends LispSpecialFunction {

src/function/builtin/special/SETQ.java

@@ -4,8 +4,12 @@ import static function.builtin.EVAL.eval;
 import static function.builtin.SET.set;
 import static function.builtin.cons.LIST.makeList;
 
-import function.*;
-import sexpression.*;
+import function.ArgumentValidator;
+import function.FunctionNames;
+import function.LispSpecialFunction;
+import sexpression.Cons;
+import sexpression.SExpression;
+import sexpression.Symbol;
 
 @FunctionNames({ "SETQ" })
 public class SETQ extends LispSpecialFunction {

src/interpreter/LispInterpreterBuilder.java

@@ -1,6 +1,7 @@
 package interpreter;
 
-import java.io.*;
+import java.io.InputStream;
+import java.io.PrintStream;
 import java.util.function.Function;
 
 public interface LispInterpreterBuilder {

src/interpreter/LispInterpreterBuilderImpl.java

@@ -2,11 +2,15 @@ package interpreter;
 
 import static util.Path.getPathPrefix;
 
-import java.io.*;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.InputStream;
+import java.io.PrintStream;
 import java.util.function.Function;
 
 import environment.RuntimeEnvironment;
-import error.*;
+import error.CriticalLispException;
+import error.ErrorManager;
 
 public class LispInterpreterBuilderImpl implements LispInterpreterBuilder {
 

src/main/LispMain.java

@@ -3,14 +3,22 @@ package main;
 import static com.googlecode.lanterna.terminal.IOSafeTerminalAdapter.createRuntimeExceptionConvertingAdapter;
 import static terminal.LispTerminal.END_OF_SEGMENT;
 
-import java.io.*;
+import java.io.IOException;
+import java.io.PipedInputStream;
+import java.io.PipedOutputStream;
+import java.io.PrintStream;
 import java.util.function.Function;
 
-import com.googlecode.lanterna.terminal.*;
+import com.googlecode.lanterna.terminal.DefaultTerminalFactory;
+import com.googlecode.lanterna.terminal.IOSafeTerminal;
+import com.googlecode.lanterna.terminal.Terminal;
 
-import interpreter.*;
+import interpreter.LispInterpreter;
+import interpreter.LispInterpreterBuilder;
+import interpreter.LispInterpreterBuilderImpl;
 import stream.UncheckedIOException;
-import terminal.*;
+import terminal.LispTerminal;
+import terminal.TerminalConfiguration;
 
 public class LispMain {
 

src/parser/LispParser.java

@@ -5,7 +5,8 @@ import java.io.InputStream;
 import error.LispException;
 import scanner.LispScanner;
 import sexpression.SExpression;
-import token.*;
+import token.Eof;
+import token.Token;
 
 /**
  * Converts a stream of bytes into internal representations of Lisp s-expressions.

src/scanner/LispCommentRemovingInputStream.java

@@ -1,6 +1,10 @@
 package scanner;
 
-import static util.Characters.*;
+import static util.Characters.BACKSLASH;
+import static util.Characters.DOUBLE_QUOTE;
+import static util.Characters.EOF;
+import static util.Characters.NEWLINE;
+import static util.Characters.SEMICOLON;
 
 import java.io.InputStream;
 

src/scanner/LispScanner.java

@@ -1,14 +1,23 @@
 package scanner;
 
-import static java.lang.Character.*;
-import static util.Characters.*;
+import static java.lang.Character.isDigit;
+import static java.lang.Character.isWhitespace;
+import static util.Characters.BACKSLASH;
+import static util.Characters.DOUBLE_QUOTE;
+import static util.Characters.EOF;
+import static util.Characters.NEWLINE;
+import static util.Characters.isLegalIdentifierCharacter;
+import static util.Characters.isNumberPrefix;
 
 import java.io.InputStream;
 import java.util.function.Function;
 
 import error.LineColumnException;
-import file.*;
-import token.*;
+import file.FilePosition;
+import file.FilePositionTracker;
+import token.Token;
+import token.TokenFactory;
+import token.TokenFactoryImpl;
 import util.Characters;
 
 /**

src/sexpression/DisplayName.java

@@ -1,6 +1,9 @@
 package sexpression;
 
-import java.lang.annotation.*;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)

src/stream/SafeInputStream.java

@@ -1,6 +1,7 @@
 package stream;
 
-import java.io.*;
+import java.io.IOException;
+import java.io.InputStream;
 
 public class SafeInputStream {
 

src/stream/SafeOutputStream.java

@@ -1,6 +1,7 @@
 package stream;
 
-import java.io.*;
+import java.io.IOException;
+import java.io.OutputStream;
 
 public class SafeOutputStream {
 

src/table/FunctionTable.java

@@ -2,15 +2,55 @@ package table;
 
 import static java.text.MessageFormat.format;
 
-import java.util.*;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
 
 import error.CriticalLispException;
-import function.*;
-import function.builtin.*;
-import function.builtin.cons.*;
-import function.builtin.math.*;
-import function.builtin.predicate.*;
-import function.builtin.special.*;
+import function.FunctionNames;
+import function.LispFunction;
+import function.builtin.APPLY;
+import function.builtin.EVAL;
+import function.builtin.EXIT;
+import function.builtin.FUNCALL;
+import function.builtin.GENSYM;
+import function.builtin.LOAD;
+import function.builtin.PRINT;
+import function.builtin.SET;
+import function.builtin.SYMBOL_FUNCTION;
+import function.builtin.cons.CONS;
+import function.builtin.cons.FIRST;
+import function.builtin.cons.LENGTH;
+import function.builtin.cons.LIST;
+import function.builtin.cons.REST;
+import function.builtin.math.DIVIDE;
+import function.builtin.math.MINUS;
+import function.builtin.math.MULTIPLY;
+import function.builtin.math.PLUS;
+import function.builtin.predicate.ATOM;
+import function.builtin.predicate.EQ;
+import function.builtin.predicate.EQUAL;
+import function.builtin.predicate.GENSYM_EQUAL;
+import function.builtin.predicate.LISTP;
+import function.builtin.predicate.NULL;
+import function.builtin.predicate.NUMERIC_EQUAL;
+import function.builtin.predicate.NUMERIC_GREATER;
+import function.builtin.predicate.NUMERIC_LESS;
+import function.builtin.special.AND;
+import function.builtin.special.CASE;
+import function.builtin.special.COND;
+import function.builtin.special.DEFINE_SPECIAL;
+import function.builtin.special.DEFMACRO;
+import function.builtin.special.DEFUN;
+import function.builtin.special.IF;
+import function.builtin.special.LAMBDA;
+import function.builtin.special.LET;
+import function.builtin.special.LET_STAR;
+import function.builtin.special.OR;
+import function.builtin.special.PROGN;
+import function.builtin.special.QUOTE;
+import function.builtin.special.SETQ;
 
 public class FunctionTable {
 

src/terminal/ControlSequenceHandler.java

@@ -1,7 +1,9 @@
 package terminal;
 
 import static java.lang.Character.isDigit;
-import static util.Characters.*;
+import static util.Characters.EOF;
+import static util.Characters.LEFT_SQUARE_BRACKET;
+import static util.Characters.UNICODE_ESCAPE;
 
 import stream.SafeInputStream;
 

src/terminal/ControlSequenceLookup.java

@@ -2,7 +2,8 @@ package terminal;
 
 import static terminal.SelectGraphicRendition.SGR_COMMAND;
 
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
 
 import terminal.ControlSequence.NullControlSequence;
 

src/terminal/LispTerminal.java

@@ -1,18 +1,29 @@
 package terminal;
 
-import static com.googlecode.lanterna.input.KeyType.*;
+import static com.googlecode.lanterna.input.KeyType.ArrowDown;
+import static com.googlecode.lanterna.input.KeyType.ArrowLeft;
+import static com.googlecode.lanterna.input.KeyType.ArrowRight;
+import static com.googlecode.lanterna.input.KeyType.ArrowUp;
+import static com.googlecode.lanterna.input.KeyType.Backspace;
+import static com.googlecode.lanterna.input.KeyType.Character;
+import static com.googlecode.lanterna.input.KeyType.Delete;
+import static com.googlecode.lanterna.input.KeyType.Enter;
 import static terminal.ControlSequenceHandler.isEscape;
 import static util.Characters.EOF;
 import static util.Characters.UNICODE_NULL;
 
 import java.io.ByteArrayInputStream;
-import java.util.concurrent.*;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
-import com.googlecode.lanterna.*;
-import com.googlecode.lanterna.input.*;
+import com.googlecode.lanterna.TerminalPosition;
+import com.googlecode.lanterna.TerminalSize;
+import com.googlecode.lanterna.input.KeyStroke;
+import com.googlecode.lanterna.input.KeyType;
 import com.googlecode.lanterna.terminal.IOSafeTerminal;
 
-import stream.*;
+import stream.SafeInputStream;
+import stream.SafeOutputStream;
 
 public class LispTerminal {
 

src/terminal/TerminalConfiguration.java

@@ -1,6 +1,8 @@
 package terminal;
 
-import java.io.*;
+import java.io.IOException;
+import java.io.PipedInputStream;
+import java.io.PipedOutputStream;
 
 import com.googlecode.lanterna.terminal.IOSafeTerminal;
 

src/terminal/TerminalHistory.java

@@ -1,6 +1,7 @@
 package terminal;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
 
 public class TerminalHistory {
 

src/token/AtSign.java

@@ -3,7 +3,8 @@ package token;
 import java.util.function.Supplier;
 
 import file.FilePosition;
-import sexpression.*;
+import sexpression.AtSignExpression;
+import sexpression.SExpression;
 
 public class AtSign extends Token {
 

src/token/Backquote.java

@@ -3,7 +3,8 @@ package token;
 import java.util.function.Supplier;
 
 import file.FilePosition;
-import sexpression.*;
+import sexpression.BackquoteExpression;
+import sexpression.SExpression;
 
 public class Backquote extends Token {
 

src/token/Comma.java

@@ -3,7 +3,8 @@ package token;
 import java.util.function.Supplier;
 
 import file.FilePosition;
-import sexpression.*;
+import sexpression.CommaExpression;
+import sexpression.SExpression;
 
 public class Comma extends Token {
 

src/token/Identifier.java

@@ -3,7 +3,8 @@ package token;
 import java.util.function.Supplier;
 
 import file.FilePosition;
-import sexpression.*;
+import sexpression.SExpression;
+import sexpression.Symbol;
 
 public class Identifier extends Token {
 

src/token/Number.java

@@ -3,7 +3,8 @@ package token;
 import java.util.function.Supplier;
 
 import file.FilePosition;
-import sexpression.*;
+import sexpression.LispNumber;
+import sexpression.SExpression;
 
 public class Number extends Token {
 

src/token/QuoteMark.java

@@ -5,7 +5,9 @@ import static sexpression.Nil.NIL;
 import java.util.function.Supplier;
 
 import file.FilePosition;
-import sexpression.*;
+import sexpression.Cons;
+import sexpression.SExpression;
+import sexpression.Symbol;
 
 public class QuoteMark extends Token {
 

src/token/QuotedString.java

@@ -3,7 +3,8 @@ package token;
 import java.util.function.Supplier;
 
 import file.FilePosition;
-import sexpression.*;
+import sexpression.LispString;
+import sexpression.SExpression;
 
 public class QuotedString extends Token {
 

src/token/Token.java

@@ -3,7 +3,8 @@ package token;
 import java.util.function.Supplier;
 
 import file.FilePosition;
-import sexpression.*;
+import sexpression.Cons;
+import sexpression.SExpression;
 
 public abstract class Token {
 

src/token/TokenFactory.java

@@ -2,7 +2,8 @@ package token;
 
 import static java.text.MessageFormat.format;
 
-import error.*;
+import error.CriticalLineColumnException;
+import error.LineColumnException;
 import file.FilePosition;
 
 public interface TokenFactory {

src/token/TokenFactoryImpl.java

@@ -1,7 +1,15 @@
 package token;
 
 import static java.lang.Character.isDigit;
-import static util.Characters.*;
+import static util.Characters.AT_SIGN;
+import static util.Characters.BACKQUOTE;
+import static util.Characters.COMMA;
+import static util.Characters.DOUBLE_QUOTE;
+import static util.Characters.LEFT_PARENTHESIS;
+import static util.Characters.RIGHT_PARENTHESIS;
+import static util.Characters.SINGLE_QUOTE;
+import static util.Characters.isLegalIdentifierCharacter;
+import static util.Characters.isNumberPrefix;
 
 import file.FilePosition;
 

src/util/Characters.java

@@ -1,6 +1,7 @@
 package util;
 
-import java.util.*;
+import java.util.HashSet;
+import java.util.Set;
 
 public final class Characters {
 

test/acceptance/fixture/LispInterpreterFixture.java

@@ -3,10 +3,16 @@ package acceptance.fixture;
 import static table.FunctionTable.resetFunctionTable;
 import static util.Path.getPathPrefix;
 
-import java.io.*;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.PrintStream;
 
 import environment.RuntimeEnvironment;
-import interpreter.*;
+import interpreter.LispInterpreter;
+import interpreter.LispInterpreterBuilder;
+import interpreter.LispInterpreterBuilderImpl;
 import table.ExecutionContext;
 
 public class LispInterpreterFixture {

test/environment/RuntimeEnvironmentTest.java

@@ -1,10 +1,16 @@
 package environment;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
-import java.util.*;
+import java.util.HashSet;
+import java.util.Set;
 
-import org.junit.*;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
 
 import error.ErrorManager;
 

test/error/ErrorManagerTest.java

@@ -1,12 +1,19 @@
 package error;
 
-import static error.ErrorManager.Severity.*;
-import static org.junit.Assert.*;
+import static error.ErrorManager.Severity.CRITICAL;
+import static error.ErrorManager.Severity.ERROR;
+import static error.ErrorManager.Severity.WARNING;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
-import java.io.*;
-import java.util.*;
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+import java.util.HashSet;
+import java.util.Set;
 
-import org.junit.*;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
 
 import environment.RuntimeEnvironment;
 import error.ErrorManager.Severity;

test/file/FilePositionTrackerTest.java

@@ -4,7 +4,8 @@ import static org.junit.Assert.assertTrue;
 
 import java.util.Objects;
 
-import org.junit.*;
+import org.junit.Before;
+import org.junit.Test;
 
 public class FilePositionTrackerTest {
 

test/function/ArgumentValidatorTest.java

@@ -1,14 +1,24 @@
 package function;
 
 import static error.ErrorManager.Severity.ERROR;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 import static sexpression.Nil.NIL;
 import static sexpression.Symbol.T;
 
-import org.junit.*;
+import org.junit.Before;
+import org.junit.Test;
 
-import function.ArgumentValidator.*;
-import sexpression.*;
+import function.ArgumentValidator.BadArgumentTypeException;
+import function.ArgumentValidator.DottedArgumentListException;
+import function.ArgumentValidator.TooFewArgumentsException;
+import function.ArgumentValidator.TooManyArgumentsException;
+import sexpression.Cons;
+import sexpression.LispString;
+import sexpression.Nil;
+import sexpression.SExpression;
+import sexpression.Symbol;
 
 public class ArgumentValidatorTest {
 

test/function/LispFunctionTest.java

@@ -4,7 +4,8 @@ import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
-import sexpression.*;
+import sexpression.Cons;
+import sexpression.SExpression;
 
 public class LispFunctionTest {
 

test/function/LispSpecialFunctionTest.java

@@ -4,7 +4,8 @@ import static org.junit.Assert.assertFalse;
 
 import org.junit.Test;
 
-import sexpression.*;
+import sexpression.Cons;
+import sexpression.SExpression;
 
 public class LispSpecialFunctionTest {
 

test/function/UserDefinedFunctionTest.java

@@ -1,15 +1,21 @@
 package function;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 import static sexpression.Nil.NIL;
 import static testutil.TestUtilities.assertSExpressionsMatch;
 
 import org.junit.Test;
 
 import error.ErrorManager;
-import function.ArgumentValidator.*;
+import function.ArgumentValidator.TooFewArgumentsException;
+import function.ArgumentValidator.TooManyArgumentsException;
 import function.UserDefinedFunction.IllegalKeywordRestPositionException;
-import sexpression.*;
+import sexpression.Cons;
+import sexpression.LispNumber;
+import sexpression.SExpression;
+import sexpression.Symbol;
 
 public class UserDefinedFunctionTest {
 

test/function/builtin/APPLYTest.java

@@ -1,11 +1,16 @@
 package function.builtin;
 
 import static function.builtin.APPLY.apply;
-import static testutil.TestUtilities.*;
+import static testutil.TestUtilities.assertSExpressionsMatch;
+import static testutil.TestUtilities.evaluateString;
+import static testutil.TestUtilities.parseString;
 
 import org.junit.Test;
 
-import function.ArgumentValidator.*;
+import function.ArgumentValidator.BadArgumentTypeException;
+import function.ArgumentValidator.DottedArgumentListException;
+import function.ArgumentValidator.TooFewArgumentsException;
+import function.ArgumentValidator.TooManyArgumentsException;
 import function.builtin.EVAL.UndefinedFunctionException;
 import sexpression.Cons;
 import testutil.SymbolAndFunctionCleaner;

test/function/builtin/BackquoteEvaluatorTest.java

@@ -2,13 +2,25 @@ package function.builtin;
 
 import static sexpression.Nil.NIL;
 import static sexpression.Symbol.T;
-import static testutil.TestUtilities.*;
+import static testutil.TestUtilities.assertIsErrorWithMessage;
+import static testutil.TestUtilities.assertSExpressionsMatch;
+import static testutil.TestUtilities.makeList;
 
 import org.junit.Test;
 
 import function.ArgumentValidator.DottedArgumentListException;
-import function.builtin.BackquoteEvaluator.*;
-import sexpression.*;
+import function.builtin.BackquoteEvaluator.AtSignNotInCommaException;
+import function.builtin.BackquoteEvaluator.AtSignNotListException;
+import function.builtin.BackquoteEvaluator.NestedAtSignException;
+import function.builtin.BackquoteEvaluator.NestedCommaException;
+import sexpression.AtSignExpression;
+import sexpression.BackquoteExpression;
+import sexpression.CommaExpression;
+import sexpression.Cons;
+import sexpression.LispNumber;
+import sexpression.LispString;
+import sexpression.SExpression;
+import sexpression.Symbol;
 
 public class BackquoteEvaluatorTest {
 

test/function/builtin/EVALTest.java

@@ -3,13 +3,21 @@ package function.builtin;
 import static function.builtin.EVAL.lookupSymbol;
 import static org.junit.Assert.assertNull;
 import static sexpression.Nil.NIL;
-import static testutil.TestUtilities.*;
+import static testutil.TestUtilities.assertIsErrorWithMessage;
+import static testutil.TestUtilities.assertSExpressionsMatch;
+import static testutil.TestUtilities.evaluateString;
+import static testutil.TestUtilities.parseString;
 
 import org.junit.Test;
 
-import function.ArgumentValidator.*;
+import function.ArgumentValidator.DottedArgumentListException;
+import function.ArgumentValidator.TooFewArgumentsException;
+import function.ArgumentValidator.TooManyArgumentsException;
 import function.builtin.BackquoteEvaluator.AtSignNotInCommaException;
-import function.builtin.EVAL.*;
+import function.builtin.EVAL.UndefinedFunctionException;
+import function.builtin.EVAL.UndefinedSymbolException;
+import function.builtin.EVAL.UnmatchedAtSignException;
+import function.builtin.EVAL.UnmatchedCommaException;
 import testutil.SymbolAndFunctionCleaner;
 
 public class EVALTest extends SymbolAndFunctionCleaner {

test/function/builtin/EXITTest.java

@@ -1,9 +1,11 @@
 package function.builtin;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 import static testutil.TestUtilities.evaluateString;
 
-import java.util.*;
+import java.util.HashSet;
+import java.util.Set;
 
 import org.junit.Test;
 

test/function/builtin/FUNCALLTest.java

@@ -1,6 +1,8 @@
 package function.builtin;
 
-import static testutil.TestUtilities.*;
+import static testutil.TestUtilities.assertSExpressionsMatch;
+import static testutil.TestUtilities.evaluateString;
+import static testutil.TestUtilities.parseString;
 
 import org.junit.Test;
 

test/function/builtin/GENSYMTest.java

@@ -1,7 +1,9 @@
 package function.builtin;
 
 import static function.builtin.GENSYM.GENSYM_PREFIX;
-import static testutil.TestUtilities.*;
+import static testutil.TestUtilities.assertSExpressionsDoNotMatch;
+import static testutil.TestUtilities.assertSExpressionsMatch;
+import static testutil.TestUtilities.evaluateString;
 import static testutil.TypeAssertions.assertSymbol;
 
 import org.junit.Test;

test/function/builtin/LOADTest.java

@@ -2,15 +2,19 @@ package function.builtin;
 
 import static org.junit.Assert.assertTrue;
 import static testutil.TestUtilities.evaluateString;
-import static testutil.TypeAssertions.*;
+import static testutil.TypeAssertions.assertNil;
+import static testutil.TypeAssertions.assertT;
 
-import java.io.*;
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
 
 import org.junit.Test;
 
 import environment.RuntimeEnvironment;
 import error.ErrorManager;
-import function.ArgumentValidator.*;
+import function.ArgumentValidator.BadArgumentTypeException;
+import function.ArgumentValidator.TooFewArgumentsException;
+import function.ArgumentValidator.TooManyArgumentsException;
 import testutil.SymbolAndFunctionCleaner;
 
 public class LOADTest extends SymbolAndFunctionCleaner {

test/function/builtin/PRINTTest.java

@@ -4,12 +4,14 @@ import static java.text.MessageFormat.format;
 import static org.junit.Assert.assertEquals;
 import static testutil.TestUtilities.evaluateString;
 
-import java.io.*;
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
 
 import org.junit.Test;
 
 import environment.RuntimeEnvironment;
-import function.ArgumentValidator.*;
+import function.ArgumentValidator.TooFewArgumentsException;
+import function.ArgumentValidator.TooManyArgumentsException;
 import testutil.SymbolAndFunctionCleaner;
 
 public class PRINTTest extends SymbolAndFunctionCleaner {

test/function/builtin/SETTest.java

@@ -1,11 +1,14 @@
 package function.builtin;
 
 import static org.junit.Assert.assertNull;
-import static testutil.TestUtilities.*;
+import static testutil.TestUtilities.assertSExpressionsMatch;
+import static testutil.TestUtilities.evaluateString;
 
 import org.junit.Test;
 
-import function.ArgumentValidator.*;
+import function.ArgumentValidator.BadArgumentTypeException;
+import function.ArgumentValidator.TooFewArgumentsException;
+import function.ArgumentValidator.TooManyArgumentsException;
 import function.builtin.EVAL.UndefinedSymbolException;
 import sexpression.LispNumber;
 import table.SymbolTable;

test/function/builtin/SYMBOL_FUNCTIONTest.java

@@ -1,13 +1,17 @@
 package function.builtin;
 
 import static error.ErrorManager.Severity.ERROR;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 import static sexpression.Nil.NIL;
 import static testutil.TestUtilities.evaluateString;
 
 import org.junit.Test;
 
-import function.ArgumentValidator.*;
+import function.ArgumentValidator.BadArgumentTypeException;
+import function.ArgumentValidator.TooFewArgumentsException;
+import function.ArgumentValidator.TooManyArgumentsException;
 import function.builtin.SYMBOL_FUNCTION.UndefinedSymbolFunctionException;
 import testutil.SymbolAndFunctionCleaner;
 

test/function/builtin/cons/CONSTest.java

@@ -1,11 +1,15 @@
 package function.builtin.cons;
 
-import static testutil.TestUtilities.*;
+import static testutil.TestUtilities.assertSExpressionsMatch;
+import static testutil.TestUtilities.evaluateString;
+import static testutil.TestUtilities.parseString;
 
 import org.junit.Test;
 
-import function.ArgumentValidator.*;
-import sexpression.*;
+import function.ArgumentValidator.TooFewArgumentsException;
+import function.ArgumentValidator.TooManyArgumentsException;
+import sexpression.Cons;
+import sexpression.Symbol;
 import testutil.SymbolAndFunctionCleaner;
 
 public class CONSTest extends SymbolAndFunctionCleaner {

test/function/builtin/cons/FIRSTTest.java

@@ -1,10 +1,14 @@
 package function.builtin.cons;
 
-import static testutil.TestUtilities.*;
+import static testutil.TestUtilities.assertSExpressionsMatch;
+import static testutil.TestUtilities.evaluateString;
+import static testutil.TestUtilities.parseString;
 
 import org.junit.Test;
 
-import function.ArgumentValidator.*;
+import function.ArgumentValidator.BadArgumentTypeException;
+import function.ArgumentValidator.TooFewArgumentsException;
+import function.ArgumentValidator.TooManyArgumentsException;
 import testutil.SymbolAndFunctionCleaner;
 
 public class FIRSTTest extends SymbolAndFunctionCleaner {

test/function/builtin/cons/LENGTHTest.java

@@ -1,10 +1,14 @@
 package function.builtin.cons;
 
-import static testutil.TestUtilities.*;
+import static testutil.TestUtilities.assertSExpressionsMatch;
+import static testutil.TestUtilities.evaluateString;
+import static testutil.TestUtilities.parseString;
 
 import org.junit.Test;
 
-import function.ArgumentValidator.*;
+import function.ArgumentValidator.BadArgumentTypeException;
+import function.ArgumentValidator.TooFewArgumentsException;
+import function.ArgumentValidator.TooManyArgumentsException;
 import testutil.SymbolAndFunctionCleaner;
 
 public class LENGTHTest extends SymbolAndFunctionCleaner {

test/function/builtin/cons/LISTTest.java

@@ -1,7 +1,9 @@
 package function.builtin.cons;
 
 import static function.builtin.cons.LIST.makeList;
-import static testutil.TestUtilities.*;
+import static testutil.TestUtilities.assertSExpressionsMatch;
+import static testutil.TestUtilities.evaluateString;
+import static testutil.TestUtilities.parseString;
 
 import org.junit.Test;
 

test/function/builtin/cons/RESTTest.java

@@ -1,10 +1,14 @@
 package function.builtin.cons;
 
-import static testutil.TestUtilities.*;
+import static testutil.TestUtilities.assertSExpressionsMatch;
+import static testutil.TestUtilities.evaluateString;
+import static testutil.TestUtilities.parseString;
 
 import org.junit.Test;
 
-import function.ArgumentValidator.*;
+import function.ArgumentValidator.BadArgumentTypeException;
+import function.ArgumentValidator.TooFewArgumentsException;
+import function.ArgumentValidator.TooManyArgumentsException;
 import testutil.SymbolAndFunctionCleaner;
 
 public class RESTTest extends SymbolAndFunctionCleaner {

test/function/builtin/math/DIVIDETest.java

@@ -1,10 +1,13 @@
 package function.builtin.math;
 
-import static testutil.TestUtilities.*;
+import static testutil.TestUtilities.assertSExpressionsMatch;
+import static testutil.TestUtilities.evaluateString;
+import static testutil.TestUtilities.parseString;
 
 import org.junit.Test;
 
-import function.ArgumentValidator.*;
+import function.ArgumentValidator.BadArgumentTypeException;
+import function.ArgumentValidator.TooFewArgumentsException;
 import testutil.SymbolAndFunctionCleaner;
 
 public class DIVIDETest extends SymbolAndFunctionCleaner {

test/function/builtin/math/MINUSTest.java

@@ -1,10 +1,12 @@
 package function.builtin.math;
 
-import static testutil.TestUtilities.*;
+import static testutil.TestUtilities.assertSExpressionsMatch;
+import static testutil.TestUtilities.evaluateString;
 
 import org.junit.Test;
 
-import function.ArgumentValidator.*;
+import function.ArgumentValidator.BadArgumentTypeException;
+import function.ArgumentValidator.TooFewArgumentsException;
 import sexpression.LispNumber;
 import testutil.SymbolAndFunctionCleaner;