Import organization

3 files changed, 12 insertions, 8 deletions

diff --git a/src/main/java/bjc/inflexion/InflectionML.java b/src/main/java/bjc/inflexion/InflectionML.java
index be1fe34..f5fbb02 100644
--- a/src/main/java/bjc/inflexion/InflectionML.java
+++ b/src/main/java/bjc/inflexion/InflectionML.java
@@ -17,9 +17,9 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.Iterator;
 import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
diff --git a/src/main/java/bjc/inflexion/InflectionString.java b/src/main/java/bjc/inflexion/InflectionString.java
index b9eb764..523e18d 100644
--- a/src/main/java/bjc/inflexion/InflectionString.java
+++ b/src/main/java/bjc/inflexion/InflectionString.java
@@ -14,6 +14,11 @@
  */
 package bjc.inflexion;
 
+import static bjc.inflexion.InflectionString.InflectionDirective.literal;
+import static bjc.inflexion.InflectionString.InflectionDirective.noun;
+import static bjc.inflexion.InflectionString.InflectionDirective.numeric;
+import static bjc.inflexion.InflectionString.InflectionDirective.variable;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -22,12 +27,12 @@ import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import bjc.inflexion.InflectionString.InflectionDirective.NounOptions;
+import bjc.inflexion.InflectionString.InflectionDirective.NumericOptions;
 import bjc.inflexion.nouns.Noun;
 import bjc.inflexion.nouns.Nouns;
 import bjc.inflexion.nouns.Prepositions;
 
-import static bjc.inflexion.InflectionString.InflectionDirective.*;
-
 /**
  * A compiled inflection markup string
  * 
diff --git a/src/test/java/bjc/inflexion/InflectionMLTest.java b/src/test/java/bjc/inflexion/InflectionMLTest.java
index f40070d..e5a95c9 100644
--- a/src/test/java/bjc/inflexion/InflectionMLTest.java
+++ b/src/test/java/bjc/inflexion/InflectionMLTest.java
@@ -1,11 +1,10 @@
 package bjc.inflexion;
 
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-import static bjc.inflexion.InflectionMLTest.InflectPair.pair;
 import static bjc.inflexion.InflectionML.inflect;
+import static bjc.inflexion.InflectionMLTest.InflectPair.pair;
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
 
 /**
  * Tests for inflection markup.