Import organization

2 files changed, 21 insertions, 4 deletions

diff --git a/src/main/java/bjc/dicelang/scl/tokens/SCLToken.java b/src/main/java/bjc/dicelang/scl/tokens/SCLToken.java
index 1075ab8..1686fb0 100644
--- a/src/main/java/bjc/dicelang/scl/tokens/SCLToken.java
+++ b/src/main/java/bjc/dicelang/scl/tokens/SCLToken.java
@@ -1,14 +1,17 @@
 package bjc.dicelang.scl.tokens;
 
+import static bjc.dicelang.scl.Errors.ErrorKey.EK_SCL_INVTOKEN;
+import static bjc.dicelang.scl.tokens.TokenType.DQUOTE;
+import static bjc.dicelang.scl.tokens.TokenType.OBRACE;
+import static bjc.dicelang.scl.tokens.TokenType.OBRACKET;
+import static bjc.dicelang.scl.tokens.TokenType.SQUOTE;
+
 import java.util.HashMap;
 import java.util.Map;
 
 import bjc.dicelang.scl.Errors;
 import bjc.utils.parserutils.TokenUtils;
 
-import static bjc.dicelang.scl.Errors.ErrorKey.*;
-import static bjc.dicelang.scl.tokens.TokenType.*;
-
 /**
  * Base class for SCL tokens.
  * 
diff --git a/src/main/java/bjc/dicelang/scl/tokens/WordSCLToken.java b/src/main/java/bjc/dicelang/scl/tokens/WordSCLToken.java
index 6fd444d..5cdd4bf 100644
--- a/src/main/java/bjc/dicelang/scl/tokens/WordSCLToken.java
+++ b/src/main/java/bjc/dicelang/scl/tokens/WordSCLToken.java
@@ -1,6 +1,20 @@
 package bjc.dicelang.scl.tokens;
 
-import static bjc.dicelang.scl.tokens.WordType.*;
+import static bjc.dicelang.scl.tokens.WordType.DEFINE;
+import static bjc.dicelang.scl.tokens.WordType.DELETESTREAM;
+import static bjc.dicelang.scl.tokens.WordType.DROP;
+import static bjc.dicelang.scl.tokens.WordType.LEFTSTREAM;
+import static bjc.dicelang.scl.tokens.WordType.MAKEARRAY;
+import static bjc.dicelang.scl.tokens.WordType.MAKEEXEC;
+import static bjc.dicelang.scl.tokens.WordType.MAKEUNEXEC;
+import static bjc.dicelang.scl.tokens.WordType.MERGESTREAM;
+import static bjc.dicelang.scl.tokens.WordType.NDROP;
+import static bjc.dicelang.scl.tokens.WordType.NEWSTREAM;
+import static bjc.dicelang.scl.tokens.WordType.NIP;
+import static bjc.dicelang.scl.tokens.WordType.NNIP;
+import static bjc.dicelang.scl.tokens.WordType.RIGHTSTREAM;
+import static bjc.dicelang.scl.tokens.WordType.STACKCOUNT;
+import static bjc.dicelang.scl.tokens.WordType.STACKEMPTY;
 
 import java.util.HashMap;
 import java.util.Map;