diff --git a/src/main/java/difflib/DiffUtils.java b/src/main/java/difflib/DiffUtils.java
index 8e757b9..121d258 100644
--- a/src/main/java/difflib/DiffUtils.java
+++ b/src/main/java/difflib/DiffUtils.java
@@ -19,15 +19,15 @@ limitations under the License.
  */
 package difflib;
 
-import difflib.patch.PatchFailedException;
-import difflib.patch.Delta;
-import difflib.patch.Chunk;
-import difflib.patch.Patch;
-import difflib.patch.ChangeDelta;
 import difflib.algorithm.DiffAlgorithm;
 import difflib.algorithm.DiffException;
-import difflib.patch.Equalizer;
 import difflib.algorithm.myers.MyersDiff;
+import difflib.patch.ChangeDelta;
+import difflib.patch.Chunk;
+import difflib.patch.Delta;
+import difflib.patch.Equalizer;
+import difflib.patch.Patch;
+import difflib.patch.PatchFailedException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.LinkedList;
diff --git a/src/main/java/difflib/algorithm/myers/MyersDiff.java b/src/main/java/difflib/algorithm/myers/MyersDiff.java
index a893b6d..60ebfb0 100644
--- a/src/main/java/difflib/algorithm/myers/MyersDiff.java
+++ b/src/main/java/difflib/algorithm/myers/MyersDiff.java
@@ -19,16 +19,15 @@ limitations under the License.
  */
 package difflib.algorithm.myers;
 
+import difflib.algorithm.DiffAlgorithm;
+import difflib.algorithm.DiffException;
+import difflib.patch.ChangeDelta;
+import difflib.patch.Chunk;
+import difflib.patch.DeleteDelta;
+import difflib.patch.Delta;
 import difflib.patch.Equalizer;
 import difflib.patch.InsertDelta;
-import difflib.patch.Delta;
-import difflib.patch.Chunk;
 import difflib.patch.Patch;
-import difflib.patch.DeleteDelta;
-import difflib.patch.ChangeDelta;
-import difflib.algorithm.DiffAlgorithm;
-import difflib.*;
-import difflib.algorithm.DiffException;
 import java.lang.reflect.Array;
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/src/main/java/difflib/text/DiffRowGenerator.java b/src/main/java/difflib/text/DiffRowGenerator.java
index cb95d60..7c27c8a 100644
--- a/src/main/java/difflib/text/DiffRowGenerator.java
+++ b/src/main/java/difflib/text/DiffRowGenerator.java
@@ -19,16 +19,16 @@ limitations under the License.
  */
 package difflib.text;
 
+import difflib.DiffUtils;
+import difflib.algorithm.DiffException;
 import difflib.patch.ChangeDelta;
 import difflib.patch.Chunk;
 import difflib.patch.DeleteDelta;
 import difflib.patch.Delta;
-import difflib.text.DiffRow.Tag;
-import difflib.DiffUtils;
-import difflib.algorithm.DiffException;
+import difflib.patch.Equalizer;
 import difflib.patch.InsertDelta;
 import difflib.patch.Patch;
-import difflib.patch.Equalizer;
+import difflib.text.DiffRow.Tag;
 import java.util.*;
 
 /**
diff --git a/src/test/java/difflib/text/StringUtilsTest.java b/src/test/java/difflib/text/StringUtilsTest.java
index 1823d11..7db40e5 100644
--- a/src/test/java/difflib/text/StringUtilsTest.java
+++ b/src/test/java/difflib/text/StringUtilsTest.java
@@ -16,7 +16,6 @@
 package difflib.text;
 
 import java.util.Collections;
-import java.util.List;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
diff --git a/src/test/java/diffutils/DiffUtilsTest.java b/src/test/java/diffutils/DiffUtilsTest.java
index c445704..4b84606 100644
--- a/src/test/java/diffutils/DiffUtilsTest.java
+++ b/src/test/java/diffutils/DiffUtilsTest.java
@@ -1,13 +1,13 @@
 package diffutils;
 
-import difflib.patch.InsertDelta;
-import difflib.patch.Delta;
-import difflib.patch.Chunk;
-import difflib.patch.ChangeDelta;
-import difflib.patch.Patch;
-import difflib.patch.DeleteDelta;
 import difflib.*;
 import difflib.algorithm.DiffException;
+import difflib.patch.ChangeDelta;
+import difflib.patch.Chunk;
+import difflib.patch.DeleteDelta;
+import difflib.patch.Delta;
+import difflib.patch.InsertDelta;
+import difflib.patch.Patch;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
diff --git a/src/test/java/diffutils/examples/ComputeDifference.java b/src/test/java/diffutils/examples/ComputeDifference.java
index da6b6f7..0c76dd4 100644
--- a/src/test/java/diffutils/examples/ComputeDifference.java
+++ b/src/test/java/diffutils/examples/ComputeDifference.java
@@ -1,8 +1,8 @@
 package diffutils.examples;
 
-import difflib.patch.Delta;
 import difflib.DiffUtils;
 import difflib.algorithm.DiffException;
+import difflib.patch.Delta;
 import difflib.patch.Patch;
 import diffutils.TestConstants;
 import java.util.List;