Minor cleanups

3 files changed, 14 insertions, 20 deletions

diff --git a/src/main/java/bjc/everge/ReplSet.java b/src/main/java/bjc/everge/ReplSet.java
index a477456..819779d 100644
--- a/src/main/java/bjc/everge/ReplSet.java
+++ b/src/main/java/bjc/everge/ReplSet.java
@@ -1,12 +1,8 @@
 package bjc.everge;
 
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
+import java.io.*;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Scanner;
+import java.util.*;
 
 /**
  * A set of ReplPairs, kept together for easy use
@@ -36,6 +32,13 @@ public class ReplSet {
 		parList = lst;
 	}
 
+	/**
+	 * Load a ReplSet from a file.
+	 * @param fName
+	 * 	The file to load the ReplSet from.
+	 * @return A ReplSet, loaded from the file.
+	 * @throws IOException if something goes badly reading it.
+	 */
 	public static ReplSet fromFile(String fName) throws IOException {
 		ReplSet rs = new ReplSet();
 
diff --git a/src/main/java/bjc/everge/StringUtils.java b/src/main/java/bjc/everge/StringUtils.java
index f194eae..7cfb49b 100644
--- a/src/main/java/bjc/everge/StringUtils.java
+++ b/src/main/java/bjc/everge/StringUtils.java
@@ -1,8 +1,6 @@
 package bjc.everge;
 
-import java.util.Arrays;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
 
 import java.util.regex.Pattern;
 
@@ -12,10 +10,13 @@ import java.util.regex.Pattern;
  * @author Ben Culkin.
  */
 public class StringUtils {
+	/**
+	 * Is the class in debug mode or not?
+	 */
 	public static boolean isDebug = false;
 
 	/**
-	 * Split a string on every occurance of a string not preceeded by an escape.
+	 * Split a string on every occurrence of a string not preceded by an escape.
 	 *
 	 * @param escape
 	 * 		The escape that stops splitting.
@@ -138,12 +139,6 @@ public class StringUtils {
 			while (sidx != -1 && hasEscape) {
 				int oidx = wrk.indexOf(splat, sidx + escape.length());
 
-				if (isDebug) {
-					String s1 = wrk.substring(0, sidx);
-					String s2 = wrk.substring(sidx, sidx + escape.length());
-					String s3 = wrk.substring(sidx + escape.length());
-				}
-
 				if (oidx == -1) break;
 
 				{
diff --git a/src/test/java/bjc/everge/ControlledStringTest.java b/src/test/java/bjc/everge/ControlledStringTest.java
index 8d76354..43a660e 100644
--- a/src/test/java/bjc/everge/ControlledStringTest.java
+++ b/src/test/java/bjc/everge/ControlledStringTest.java
@@ -1,14 +1,10 @@
 package bjc.everge;
 
-import bjc.everge.ControlledString.Control;
-
 import org.junit.Test;
 
 import static bjc.everge.ControlledString.Control.C;
 import static bjc.everge.TestUtils.*;
 
-import static org.junit.Assert.*;
-
 /**
  * Test for ControlledString.
  *