diff --git a/baksmali/src/main/java/org/jf/baksmali/Adaptors/ClassDefinition.java b/baksmali/src/main/java/org/jf/baksmali/Adaptors/ClassDefinition.java
index edb429d8..a194ea3f 100644
--- a/baksmali/src/main/java/org/jf/baksmali/Adaptors/ClassDefinition.java
+++ b/baksmali/src/main/java/org/jf/baksmali/Adaptors/ClassDefinition.java
@@ -28,15 +28,15 @@
 
 package org.jf.baksmali.Adaptors;
 
-import org.jf.dexlib.ClassDefItem;
-import org.jf.dexlib.TypeIdItem;
 import org.jf.dexlib.ClassDataItem;
+import org.jf.dexlib.ClassDefItem;
 import org.jf.dexlib.EncodedArrayItem;
 import org.jf.dexlib.EncodedValue.EncodedValue;
+import org.jf.dexlib.TypeIdItem;
 import org.jf.dexlib.util.AccessFlags;
 
-import java.util.List;
 import java.util.ArrayList;
+import java.util.List;
 
 public class ClassDefinition {
     private ClassDefItem classDefItem;
diff --git a/baksmali/src/main/java/org/jf/baksmali/Adaptors/FieldDefinition.java b/baksmali/src/main/java/org/jf/baksmali/Adaptors/FieldDefinition.java
index d22b31c9..b0206d9e 100644
--- a/baksmali/src/main/java/org/jf/baksmali/Adaptors/FieldDefinition.java
+++ b/baksmali/src/main/java/org/jf/baksmali/Adaptors/FieldDefinition.java
@@ -28,14 +28,14 @@
 
 package org.jf.baksmali.Adaptors;
 
-import org.jf.dexlib.ClassDataItem;
-import org.jf.dexlib.FieldIdItem;
-import org.jf.dexlib.EncodedValue.EncodedValue;
-import org.jf.dexlib.util.AccessFlags;
 import org.jf.baksmali.Adaptors.EncodedValue.EncodedValueAdaptor;
+import org.jf.dexlib.ClassDataItem;
+import org.jf.dexlib.EncodedValue.EncodedValue;
+import org.jf.dexlib.FieldIdItem;
+import org.jf.dexlib.util.AccessFlags;
 
-import java.util.List;
 import java.util.ArrayList;
+import java.util.List;
 
 public class FieldDefinition {
     private ClassDataItem.EncodedField encodedField;
diff --git a/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/ArrayDataMethodItem.java b/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/ArrayDataMethodItem.java
index db5eddc7..1027dcaa 100644
--- a/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/ArrayDataMethodItem.java
+++ b/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/ArrayDataMethodItem.java
@@ -30,8 +30,8 @@ package org.jf.baksmali.Adaptors.Format;
 
 import org.jf.dexlib.code.Format.ArrayDataPseudoInstruction;
 
-import java.util.List;
 import java.util.ArrayList;
+import java.util.List;
 
 public class ArrayDataMethodItem extends InstructionFormatMethodItem<ArrayDataPseudoInstruction> {
     public ArrayDataMethodItem(int offset, ArrayDataPseudoInstruction instruction) {
diff --git a/baksmali/src/main/java/org/jf/baksmali/Adaptors/MethodDefinition.java b/baksmali/src/main/java/org/jf/baksmali/Adaptors/MethodDefinition.java
index fe1d1b64..6dee5807 100644
--- a/baksmali/src/main/java/org/jf/baksmali/Adaptors/MethodDefinition.java
+++ b/baksmali/src/main/java/org/jf/baksmali/Adaptors/MethodDefinition.java
@@ -28,15 +28,15 @@
 
 package org.jf.baksmali.Adaptors;
 
+import org.jf.baksmali.Adaptors.Format.*;
 import org.jf.dexlib.ClassDataItem;
 import org.jf.dexlib.CodeItem;
 import org.jf.dexlib.MethodIdItem;
-import org.jf.dexlib.code.InstructionField;
-import org.jf.dexlib.code.Instruction;
-import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.code.Format.*;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.code.InstructionField;
+import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.util.AccessFlags;
-import org.jf.baksmali.Adaptors.Format.*;
 
 import java.util.*;
 
diff --git a/baksmali/src/main/java/org/jf/baksmali/baksmali.java b/baksmali/src/main/java/org/jf/baksmali/baksmali.java
index dd012a5c..264180e6 100644
--- a/baksmali/src/main/java/org/jf/baksmali/baksmali.java
+++ b/baksmali/src/main/java/org/jf/baksmali/baksmali.java
@@ -30,12 +30,12 @@ package org.jf.baksmali;
 
 import org.antlr.stringtemplate.StringTemplate;
 import org.antlr.stringtemplate.StringTemplateGroup;
-import org.jf.dexlib.DexFile;
 import org.jf.baksmali.Adaptors.ClassDefinition;
 import org.jf.baksmali.Renderers.*;
+import org.jf.dexlib.DexFile;
 
-import java.io.FileReader;
 import java.io.File;
+import java.io.FileReader;
 
 public class baksmali {
     public static void main(String[] args) throws Exception
diff --git a/baksmali/src/main/java/org/jf/baksmali/main.java b/baksmali/src/main/java/org/jf/baksmali/main.java
index 1505dce5..17261cc7 100644
--- a/baksmali/src/main/java/org/jf/baksmali/main.java
+++ b/baksmali/src/main/java/org/jf/baksmali/main.java
@@ -16,8 +16,6 @@
 
 package org.jf.baksmali;
 
-import org.jf.baksmali.UsageException;
-
 /**
  * Main class for baksmali. It recognizes enough options to be able to dispatch
  * to the right "actual" main.
diff --git a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/AnnotationEncodedValueSubField.java b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/AnnotationEncodedValueSubField.java
index f8f92a28..c818e84f 100644
--- a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/AnnotationEncodedValueSubField.java
+++ b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/AnnotationEncodedValueSubField.java
@@ -31,8 +31,8 @@ package org.jf.dexlib.EncodedValue;
 import org.jf.dexlib.*;
 
 import java.util.ArrayList;
-import java.util.List;
 import java.util.Collections;
+import java.util.List;
 
 public class AnnotationEncodedValueSubField extends CompositeField<AnnotationEncodedValueSubField>
     implements EncodedValueSubField<AnnotationEncodedValueSubField> {
diff --git a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/BoolEncodedValueSubField.java b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/BoolEncodedValueSubField.java
index 58e44303..e488c9e6 100644
--- a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/BoolEncodedValueSubField.java
+++ b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/BoolEncodedValueSubField.java
@@ -28,8 +28,8 @@
 
 package org.jf.dexlib.EncodedValue;
 
-import org.jf.dexlib.util.Input;
 import org.jf.dexlib.util.AnnotatedOutput;
+import org.jf.dexlib.util.Input;
 
 public class BoolEncodedValueSubField
     extends SimpleEncodedValueSubField<Boolean, BoolEncodedValueSubField>
diff --git a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/ByteEncodedValueSubField.java b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/ByteEncodedValueSubField.java
index 53687b09..abc853ba 100644
--- a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/ByteEncodedValueSubField.java
+++ b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/ByteEncodedValueSubField.java
@@ -28,8 +28,8 @@
 
 package org.jf.dexlib.EncodedValue;
 
-import org.jf.dexlib.util.Input;
 import org.jf.dexlib.util.AnnotatedOutput;
+import org.jf.dexlib.util.Input;
 
 public class ByteEncodedValueSubField
     extends SimpleEncodedValueSubField<Byte, ByteEncodedValueSubField>
diff --git a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/CharEncodedValueSubField.java b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/CharEncodedValueSubField.java
index bb9e9e84..b39dc58d 100644
--- a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/CharEncodedValueSubField.java
+++ b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/CharEncodedValueSubField.java
@@ -28,9 +28,9 @@
 
 package org.jf.dexlib.EncodedValue;
 
+import org.jf.dexlib.util.AnnotatedOutput;
 import org.jf.dexlib.util.EncodedValueUtils;
 import org.jf.dexlib.util.Input;
-import org.jf.dexlib.util.AnnotatedOutput;
 
 public class CharEncodedValueSubField
     extends SimpleEncodedValueSubField<Character, CharEncodedValueSubField>
diff --git a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/DoubleEncodedValueSubField.java b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/DoubleEncodedValueSubField.java
index 1317025f..6c4b62b5 100644
--- a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/DoubleEncodedValueSubField.java
+++ b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/DoubleEncodedValueSubField.java
@@ -28,9 +28,9 @@
 
 package org.jf.dexlib.EncodedValue;
 
+import org.jf.dexlib.util.AnnotatedOutput;
 import org.jf.dexlib.util.EncodedValueUtils;
 import org.jf.dexlib.util.Input;
-import org.jf.dexlib.util.AnnotatedOutput;
 
 public class DoubleEncodedValueSubField
         extends SimpleEncodedValueSubField<Double, DoubleEncodedValueSubField>
diff --git a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/EncodedIndexedItemReference.java b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/EncodedIndexedItemReference.java
index eee7e312..8a6facaa 100644
--- a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/EncodedIndexedItemReference.java
+++ b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/EncodedIndexedItemReference.java
@@ -29,9 +29,9 @@
 package org.jf.dexlib.EncodedValue;
 
 import org.jf.dexlib.*;
-import org.jf.dexlib.util.Input;
-import org.jf.dexlib.util.EncodedValueUtils;
 import org.jf.dexlib.util.AnnotatedOutput;
+import org.jf.dexlib.util.EncodedValueUtils;
+import org.jf.dexlib.util.Input;
 
 public class EncodedIndexedItemReference<T extends IndexedItem<T>>
     implements EncodedValueSubField<EncodedIndexedItemReference<T>> {
diff --git a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/FloatEncodedValueSubField.java b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/FloatEncodedValueSubField.java
index 77e3d986..0a0f1ccf 100644
--- a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/FloatEncodedValueSubField.java
+++ b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/FloatEncodedValueSubField.java
@@ -28,9 +28,9 @@
 
 package org.jf.dexlib.EncodedValue;
 
+import org.jf.dexlib.util.AnnotatedOutput;
 import org.jf.dexlib.util.EncodedValueUtils;
 import org.jf.dexlib.util.Input;
-import org.jf.dexlib.util.AnnotatedOutput;
 
 public class FloatEncodedValueSubField
         extends SimpleEncodedValueSubField<Float, FloatEncodedValueSubField>
diff --git a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/IntEncodedValueSubField.java b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/IntEncodedValueSubField.java
index a7aa9f4d..f903b8ec 100644
--- a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/IntEncodedValueSubField.java
+++ b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/IntEncodedValueSubField.java
@@ -28,9 +28,9 @@
 
 package org.jf.dexlib.EncodedValue;
 
+import org.jf.dexlib.util.AnnotatedOutput;
 import org.jf.dexlib.util.EncodedValueUtils;
 import org.jf.dexlib.util.Input;
-import org.jf.dexlib.util.AnnotatedOutput;
 
 public class IntEncodedValueSubField
         extends SimpleEncodedValueSubField<Integer, IntEncodedValueSubField>
diff --git a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/LongEncodedValueSubField.java b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/LongEncodedValueSubField.java
index 75d616bd..8bea5bd7 100644
--- a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/LongEncodedValueSubField.java
+++ b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/LongEncodedValueSubField.java
@@ -28,9 +28,9 @@
 
 package org.jf.dexlib.EncodedValue;
 
+import org.jf.dexlib.util.AnnotatedOutput;
 import org.jf.dexlib.util.EncodedValueUtils;
 import org.jf.dexlib.util.Input;
-import org.jf.dexlib.util.AnnotatedOutput;
 
 public class LongEncodedValueSubField
         extends SimpleEncodedValueSubField<Long, LongEncodedValueSubField>
diff --git a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/NullEncodedValueSubField.java b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/NullEncodedValueSubField.java
index 91f8bfdd..0311b21f 100644
--- a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/NullEncodedValueSubField.java
+++ b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/NullEncodedValueSubField.java
@@ -28,8 +28,8 @@
 
 package org.jf.dexlib.EncodedValue;
 
-import org.jf.dexlib.util.Input;
 import org.jf.dexlib.util.AnnotatedOutput;
+import org.jf.dexlib.util.Input;
 
 public class NullEncodedValueSubField
     extends SimpleEncodedValueSubField<Object, NullEncodedValueSubField>
diff --git a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/ShortEncodedValueSubField.java b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/ShortEncodedValueSubField.java
index 10a07af2..8fa6dc37 100644
--- a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/ShortEncodedValueSubField.java
+++ b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/ShortEncodedValueSubField.java
@@ -28,9 +28,9 @@
 
 package org.jf.dexlib.EncodedValue;
 
+import org.jf.dexlib.util.AnnotatedOutput;
 import org.jf.dexlib.util.EncodedValueUtils;
 import org.jf.dexlib.util.Input;
-import org.jf.dexlib.util.AnnotatedOutput;
 
 public class ShortEncodedValueSubField
         extends SimpleEncodedValueSubField<Short, ShortEncodedValueSubField>
diff --git a/dexlib/src/main/java/org/jf/dexlib/code/Format/ArrayDataPseudoInstruction.java b/dexlib/src/main/java/org/jf/dexlib/code/Format/ArrayDataPseudoInstruction.java
index 3a521483..4d0e3ca6 100644
--- a/dexlib/src/main/java/org/jf/dexlib/code/Format/ArrayDataPseudoInstruction.java
+++ b/dexlib/src/main/java/org/jf/dexlib/code/Format/ArrayDataPseudoInstruction.java
@@ -28,14 +28,14 @@
 
 package org.jf.dexlib.code.Format;
 
-import org.jf.dexlib.code.Instruction;
-import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.DexFile;
 import org.jf.dexlib.IndexedItem;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.util.Input;
 
-import java.util.List;
 import java.util.ArrayList;
+import java.util.List;
 
 public class ArrayDataPseudoInstruction extends Instruction
 {
diff --git a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction10t.java b/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction10t.java
index 55fd3c5a..68cb063a 100644
--- a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction10t.java
+++ b/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction10t.java
@@ -28,10 +28,10 @@
 
 package org.jf.dexlib.code.Format;
 
-import org.jf.dexlib.code.Instruction;
-import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.DexFile;
 import org.jf.dexlib.IndexedItem;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.code.Opcode;
 
 public class Instruction10t extends Instruction
 {
diff --git a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction10x.java b/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction10x.java
index bb59f792..61430a4a 100644
--- a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction10x.java
+++ b/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction10x.java
@@ -28,10 +28,10 @@
 
 package org.jf.dexlib.code.Format;
 
-import org.jf.dexlib.code.Instruction;
-import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.DexFile;
 import org.jf.dexlib.IndexedItem;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.code.Opcode;
 
 public class Instruction10x extends Instruction
 {
diff --git a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction11n.java b/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction11n.java
index 2f072705..c983668d 100644
--- a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction11n.java
+++ b/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction11n.java
@@ -28,10 +28,10 @@
 
 package org.jf.dexlib.code.Format;
 
-import org.jf.dexlib.code.Instruction;
-import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.DexFile;
 import org.jf.dexlib.IndexedItem;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.util.NumberUtils;
 
 public class Instruction11n extends Instruction
diff --git a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction11x.java b/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction11x.java
index 25a216f0..c3eed89e 100644
--- a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction11x.java
+++ b/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction11x.java
@@ -28,10 +28,10 @@
 
 package org.jf.dexlib.code.Format;
 
-import org.jf.dexlib.code.Instruction;
-import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.DexFile;
 import org.jf.dexlib.IndexedItem;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.util.NumberUtils;
 
 public class Instruction11x extends Instruction
diff --git a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction12x.java b/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction12x.java
index b915156b..728d35e5 100644
--- a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction12x.java
+++ b/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction12x.java
@@ -28,10 +28,10 @@
 
 package org.jf.dexlib.code.Format;
 
-import org.jf.dexlib.code.Instruction;
-import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.DexFile;
 import org.jf.dexlib.IndexedItem;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.util.NumberUtils;
 
 public class Instruction12x extends Instruction
diff --git a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction20t.java b/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction20t.java
index a8c7fc7e..f62df1e9 100644
--- a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction20t.java
+++ b/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction20t.java
@@ -28,10 +28,10 @@
 
 package org.jf.dexlib.code.Format;
 
-import org.jf.dexlib.code.Instruction;
-import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.DexFile;
 import org.jf.dexlib.IndexedItem;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.util.NumberUtils;
 
 public class Instruction20t extends Instruction
diff --git a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction21c.java b/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction21c.java
index 05342a42..71fca5d0 100644
--- a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction21c.java
+++ b/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction21c.java
@@ -28,11 +28,11 @@
 
 package org.jf.dexlib.code.Format;
 
-import org.jf.dexlib.code.Instruction;
-import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.DexFile;
 import org.jf.dexlib.IndexedItem;
 import org.jf.dexlib.TypeIdItem;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.util.NumberUtils;
 
 public class Instruction21c extends Instruction
diff --git a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction21h.java b/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction21h.java
index 81ff3896..04c17736 100644
--- a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction21h.java
+++ b/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction21h.java
@@ -28,10 +28,10 @@
 
 package org.jf.dexlib.code.Format;
 
-import org.jf.dexlib.code.Instruction;
-import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.DexFile;
 import org.jf.dexlib.IndexedItem;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.util.NumberUtils;
 
 public class Instruction21h extends Instruction
diff --git a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction21s.java b/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction21s.java
index 032bf4a3..5def4c0a 100644
--- a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction21s.java
+++ b/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction21s.java
@@ -28,10 +28,10 @@
 
 package org.jf.dexlib.code.Format;
 
-import org.jf.dexlib.code.Instruction;
-import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.DexFile;
 import org.jf.dexlib.IndexedItem;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.util.NumberUtils;
 
 public class Instruction21s extends Instruction
diff --git a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction21t.java b/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction21t.java
index b59342c8..53c04d87 100644
--- a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction21t.java
+++ b/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction21t.java
@@ -28,10 +28,10 @@
 
 package org.jf.dexlib.code.Format;
 
-import org.jf.dexlib.code.Instruction;
-import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.DexFile;
 import org.jf.dexlib.IndexedItem;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.util.NumberUtils;
 
 public class Instruction21t extends Instruction
diff --git a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction22b.java b/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction22b.java
index e3131666..97103c7a 100644
--- a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction22b.java
+++ b/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction22b.java
@@ -28,10 +28,10 @@
 
 package org.jf.dexlib.code.Format;
 
-import org.jf.dexlib.code.Instruction;
-import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.DexFile;
 import org.jf.dexlib.IndexedItem;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.util.NumberUtils;
 
 public class Instruction22b extends Instruction
diff --git a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction22c.java b/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction22c.java
index aecee5e3..ed8fa3be 100644
--- a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction22c.java
+++ b/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction22c.java
@@ -28,10 +28,10 @@
 
 package org.jf.dexlib.code.Format;
 
-import org.jf.dexlib.code.Instruction;
-import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.DexFile;
 import org.jf.dexlib.IndexedItem;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.util.NumberUtils;
 
 public class Instruction22c extends Instruction
diff --git a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction22s.java b/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction22s.java
index 004e2ba9..12231ca8 100644
--- a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction22s.java
+++ b/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction22s.java
@@ -28,10 +28,10 @@
 
 package org.jf.dexlib.code.Format;
 
-import org.jf.dexlib.code.Instruction;
-import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.DexFile;
 import org.jf.dexlib.IndexedItem;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.util.NumberUtils;
 
 public class Instruction22s extends Instruction
diff --git a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction22t.java b/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction22t.java
index 6ebe57d7..fde8a257 100644
--- a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction22t.java
+++ b/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction22t.java
@@ -28,10 +28,10 @@
 
 package org.jf.dexlib.code.Format;
 
-import org.jf.dexlib.code.Instruction;
-import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.DexFile;
 import org.jf.dexlib.IndexedItem;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.util.NumberUtils;
 
 public class Instruction22t extends Instruction
diff --git a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction22x.java b/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction22x.java
index 94412858..3f98cca7 100644
--- a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction22x.java
+++ b/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction22x.java
@@ -28,10 +28,10 @@
 
 package org.jf.dexlib.code.Format;
 
-import org.jf.dexlib.code.Instruction;
-import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.DexFile;
 import org.jf.dexlib.IndexedItem;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.util.NumberUtils;
 
 public class Instruction22x extends Instruction
diff --git a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction23x.java b/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction23x.java
index 0e99c4a9..1471c71a 100644
--- a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction23x.java
+++ b/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction23x.java
@@ -28,10 +28,10 @@
 
 package org.jf.dexlib.code.Format;
 
-import org.jf.dexlib.code.Instruction;
-import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.DexFile;
 import org.jf.dexlib.IndexedItem;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.util.NumberUtils;
 
 public class Instruction23x extends Instruction
diff --git a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction30t.java b/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction30t.java
index 16d7e0b2..e36fa932 100644
--- a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction30t.java
+++ b/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction30t.java
@@ -28,10 +28,10 @@
 
 package org.jf.dexlib.code.Format;
 
-import org.jf.dexlib.code.Instruction;
-import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.DexFile;
 import org.jf.dexlib.IndexedItem;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.util.NumberUtils;
 
 public class Instruction30t extends Instruction
diff --git a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction31c.java b/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction31c.java
index 418e6ac3..c80e9d97 100644
--- a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction31c.java
+++ b/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction31c.java
@@ -28,10 +28,10 @@
 
 package org.jf.dexlib.code.Format;
 
-import org.jf.dexlib.code.Instruction;
-import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.DexFile;
 import org.jf.dexlib.IndexedItem;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.util.NumberUtils;
 
 public class Instruction31c extends Instruction
diff --git a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction31i.java b/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction31i.java
index 3668c4a0..f0c187e0 100644
--- a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction31i.java
+++ b/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction31i.java
@@ -28,10 +28,10 @@
 
 package org.jf.dexlib.code.Format;
 
-import org.jf.dexlib.code.Instruction;
-import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.DexFile;
 import org.jf.dexlib.IndexedItem;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.util.NumberUtils;
 
 public class Instruction31i extends Instruction
diff --git a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction31t.java b/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction31t.java
index 155b292c..bc8fe51e 100644
--- a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction31t.java
+++ b/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction31t.java
@@ -28,10 +28,10 @@
 
 package org.jf.dexlib.code.Format;
 
-import org.jf.dexlib.code.Instruction;
-import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.DexFile;
 import org.jf.dexlib.IndexedItem;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.util.NumberUtils;
 
 public class Instruction31t extends Instruction
diff --git a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction32x.java b/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction32x.java
index a6038491..f77ef9ed 100644
--- a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction32x.java
+++ b/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction32x.java
@@ -28,10 +28,10 @@
 
 package org.jf.dexlib.code.Format;
 
-import org.jf.dexlib.code.Instruction;
-import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.DexFile;
 import org.jf.dexlib.IndexedItem;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.util.NumberUtils;
 
 public class Instruction32x extends Instruction
diff --git a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction35c.java b/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction35c.java
index 3250121d..143f69f0 100644
--- a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction35c.java
+++ b/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction35c.java
@@ -28,11 +28,14 @@
 
 package org.jf.dexlib.code.Format;
 
-import org.jf.dexlib.*;
-import org.jf.dexlib.util.NumberUtils;
+import org.jf.dexlib.DexFile;
+import org.jf.dexlib.IndexedItem;
+import org.jf.dexlib.MethodIdItem;
+import org.jf.dexlib.TypeIdItem;
 import org.jf.dexlib.code.Instruction;
 import org.jf.dexlib.code.Opcode;
 import static org.jf.dexlib.code.Opcode.*;
+import org.jf.dexlib.util.NumberUtils;
 
 public class Instruction35c extends Instruction
 {
diff --git a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction3rc.java b/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction3rc.java
index 47c98d7e..d28279de 100644
--- a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction3rc.java
+++ b/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction3rc.java
@@ -28,11 +28,14 @@
 
 package org.jf.dexlib.code.Format;
 
-import org.jf.dexlib.*;
-import org.jf.dexlib.util.NumberUtils;
+import org.jf.dexlib.DexFile;
+import org.jf.dexlib.IndexedItem;
+import org.jf.dexlib.MethodIdItem;
+import org.jf.dexlib.TypeIdItem;
 import org.jf.dexlib.code.Instruction;
 import org.jf.dexlib.code.Opcode;
 import static org.jf.dexlib.code.Opcode.*;
+import org.jf.dexlib.util.NumberUtils;
 
 public class Instruction3rc extends Instruction
 {
diff --git a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction51l.java b/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction51l.java
index a04b9fb2..fff6de13 100644
--- a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction51l.java
+++ b/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction51l.java
@@ -28,10 +28,10 @@
 
 package org.jf.dexlib.code.Format;
 
-import org.jf.dexlib.code.Instruction;
-import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.DexFile;
 import org.jf.dexlib.IndexedItem;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.util.NumberUtils;
 
 public class Instruction51l extends Instruction
diff --git a/dexlib/src/main/java/org/jf/dexlib/code/Format/PackedSwitchDataPseudoInstruction.java b/dexlib/src/main/java/org/jf/dexlib/code/Format/PackedSwitchDataPseudoInstruction.java
index 35abc497..1dbb55ed 100644
--- a/dexlib/src/main/java/org/jf/dexlib/code/Format/PackedSwitchDataPseudoInstruction.java
+++ b/dexlib/src/main/java/org/jf/dexlib/code/Format/PackedSwitchDataPseudoInstruction.java
@@ -28,10 +28,10 @@
 
 package org.jf.dexlib.code.Format;
 
-import org.jf.dexlib.code.Instruction;
-import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.DexFile;
 import org.jf.dexlib.IndexedItem;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.util.Input;
 
 public class PackedSwitchDataPseudoInstruction extends Instruction
diff --git a/dexlib/src/main/java/org/jf/dexlib/code/Format/SparseSwitchDataPseudoInstruction.java b/dexlib/src/main/java/org/jf/dexlib/code/Format/SparseSwitchDataPseudoInstruction.java
index 03b79347..c15a6bd7 100644
--- a/dexlib/src/main/java/org/jf/dexlib/code/Format/SparseSwitchDataPseudoInstruction.java
+++ b/dexlib/src/main/java/org/jf/dexlib/code/Format/SparseSwitchDataPseudoInstruction.java
@@ -28,10 +28,10 @@
 
 package org.jf.dexlib.code.Format;
 
-import org.jf.dexlib.code.Instruction;
-import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.DexFile;
 import org.jf.dexlib.IndexedItem;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.util.Input;
 
 public class SparseSwitchDataPseudoInstruction extends Instruction
diff --git a/dexlib/src/main/java/org/jf/dexlib/code/Instruction.java b/dexlib/src/main/java/org/jf/dexlib/code/Instruction.java
index c97a1f67..d16490c8 100644
--- a/dexlib/src/main/java/org/jf/dexlib/code/Instruction.java
+++ b/dexlib/src/main/java/org/jf/dexlib/code/Instruction.java
@@ -30,11 +30,6 @@ package org.jf.dexlib.code;
 
 import org.jf.dexlib.*;
 import org.jf.dexlib.code.Format.Format;
-import org.jf.dexlib.util.Input;
-import org.jf.dexlib.util.AnnotatedOutput;
-
-import java.util.Collections;
-import java.lang.reflect.Array;
 
 public abstract class Instruction {
     private DexFile dexFile;
diff --git a/dexlib/src/main/java/org/jf/dexlib/code/InstructionField.java b/dexlib/src/main/java/org/jf/dexlib/code/InstructionField.java
index 064cb873..c2b2de18 100644
--- a/dexlib/src/main/java/org/jf/dexlib/code/InstructionField.java
+++ b/dexlib/src/main/java/org/jf/dexlib/code/InstructionField.java
@@ -28,12 +28,12 @@
 
 package org.jf.dexlib.code;
 
-import org.jf.dexlib.Field;
 import org.jf.dexlib.DexFile;
+import org.jf.dexlib.Field;
 import org.jf.dexlib.IndexedItem;
+import org.jf.dexlib.code.Format.ArrayDataPseudoInstruction;
 import org.jf.dexlib.code.Format.PackedSwitchDataPseudoInstruction;
 import org.jf.dexlib.code.Format.SparseSwitchDataPseudoInstruction;
-import org.jf.dexlib.code.Format.ArrayDataPseudoInstruction;
 import org.jf.dexlib.util.AnnotatedOutput;
 import org.jf.dexlib.util.Input;
 
diff --git a/dexlib/src/main/java/org/jf/dexlib/code/Opcode.java b/dexlib/src/main/java/org/jf/dexlib/code/Opcode.java
index ae908f25..291bc9a4 100644
--- a/dexlib/src/main/java/org/jf/dexlib/code/Opcode.java
+++ b/dexlib/src/main/java/org/jf/dexlib/code/Opcode.java
@@ -28,7 +28,7 @@
 
 package org.jf.dexlib.code;
 
-import org.jf.dexlib.code.Format.*;
+import org.jf.dexlib.code.Format.Format;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/dexlib/src/main/java/org/jf/dexlib/debug/AdvanceLine.java b/dexlib/src/main/java/org/jf/dexlib/debug/AdvanceLine.java
index b3c070b3..7a533774 100644
--- a/dexlib/src/main/java/org/jf/dexlib/debug/AdvanceLine.java
+++ b/dexlib/src/main/java/org/jf/dexlib/debug/AdvanceLine.java
@@ -28,9 +28,9 @@
 
 package org.jf.dexlib.debug;
 
+import org.jf.dexlib.ByteField;
 import org.jf.dexlib.CompositeField;
 import org.jf.dexlib.Field;
-import org.jf.dexlib.ByteField;
 import org.jf.dexlib.SignedLeb128Field;
 
 public class AdvanceLine extends CompositeField<AdvanceLine> implements DebugInstruction<AdvanceLine> {
diff --git a/dexlib/src/main/java/org/jf/dexlib/debug/AdvancePC.java b/dexlib/src/main/java/org/jf/dexlib/debug/AdvancePC.java
index 0ed7a320..03b3bf49 100644
--- a/dexlib/src/main/java/org/jf/dexlib/debug/AdvancePC.java
+++ b/dexlib/src/main/java/org/jf/dexlib/debug/AdvancePC.java
@@ -28,7 +28,10 @@
 
 package org.jf.dexlib.debug;
 
-import org.jf.dexlib.*;
+import org.jf.dexlib.ByteField;
+import org.jf.dexlib.CompositeField;
+import org.jf.dexlib.Field;
+import org.jf.dexlib.Leb128Field;
 
 public class AdvancePC extends CompositeField<AdvancePC> implements DebugInstruction<AdvancePC> {
     private final ByteField opcodeField;
diff --git a/dexlib/src/main/java/org/jf/dexlib/debug/EndLocal.java b/dexlib/src/main/java/org/jf/dexlib/debug/EndLocal.java
index ae28b757..c8eea8c0 100644
--- a/dexlib/src/main/java/org/jf/dexlib/debug/EndLocal.java
+++ b/dexlib/src/main/java/org/jf/dexlib/debug/EndLocal.java
@@ -28,7 +28,10 @@
 
 package org.jf.dexlib.debug;
 
-import org.jf.dexlib.*;
+import org.jf.dexlib.ByteField;
+import org.jf.dexlib.CompositeField;
+import org.jf.dexlib.Field;
+import org.jf.dexlib.Leb128Field;
 
 public class EndLocal extends CompositeField<EndLocal> implements DebugInstruction<EndLocal> {
     private final ByteField opcode;
diff --git a/dexlib/src/main/java/org/jf/dexlib/debug/EndSequence.java b/dexlib/src/main/java/org/jf/dexlib/debug/EndSequence.java
index cb59cbca..52e70bec 100644
--- a/dexlib/src/main/java/org/jf/dexlib/debug/EndSequence.java
+++ b/dexlib/src/main/java/org/jf/dexlib/debug/EndSequence.java
@@ -28,9 +28,9 @@
 
 package org.jf.dexlib.debug;
 
+import org.jf.dexlib.ByteField;
 import org.jf.dexlib.CompositeField;
 import org.jf.dexlib.Field;
-import org.jf.dexlib.ByteField;
 
 public class EndSequence extends CompositeField<EndSequence> implements DebugInstruction<EndSequence> {
     public EndSequence() {
diff --git a/dexlib/src/main/java/org/jf/dexlib/debug/RestartLocal.java b/dexlib/src/main/java/org/jf/dexlib/debug/RestartLocal.java
index a1b2ba1a..8313e279 100644
--- a/dexlib/src/main/java/org/jf/dexlib/debug/RestartLocal.java
+++ b/dexlib/src/main/java/org/jf/dexlib/debug/RestartLocal.java
@@ -28,7 +28,10 @@
 
 package org.jf.dexlib.debug;
 
-import org.jf.dexlib.*;
+import org.jf.dexlib.ByteField;
+import org.jf.dexlib.CompositeField;
+import org.jf.dexlib.Field;
+import org.jf.dexlib.Leb128Field;
 
 public class RestartLocal extends CompositeField<RestartLocal> implements DebugInstruction<RestartLocal> {
     private final ByteField opcode;
diff --git a/dexlib/src/main/java/org/jf/dexlib/debug/SetEpilogueBegin.java b/dexlib/src/main/java/org/jf/dexlib/debug/SetEpilogueBegin.java
index e001ffd1..3fd5b775 100644
--- a/dexlib/src/main/java/org/jf/dexlib/debug/SetEpilogueBegin.java
+++ b/dexlib/src/main/java/org/jf/dexlib/debug/SetEpilogueBegin.java
@@ -28,9 +28,9 @@
 
 package org.jf.dexlib.debug;
 
+import org.jf.dexlib.ByteField;
 import org.jf.dexlib.CompositeField;
 import org.jf.dexlib.Field;
-import org.jf.dexlib.ByteField;
 
 public class SetEpilogueBegin extends CompositeField<SetEpilogueBegin> implements DebugInstruction<SetEpilogueBegin> {
     public SetEpilogueBegin() {
diff --git a/dexlib/src/main/java/org/jf/dexlib/debug/SetPrologueEnd.java b/dexlib/src/main/java/org/jf/dexlib/debug/SetPrologueEnd.java
index eb629099..7766ae6c 100644
--- a/dexlib/src/main/java/org/jf/dexlib/debug/SetPrologueEnd.java
+++ b/dexlib/src/main/java/org/jf/dexlib/debug/SetPrologueEnd.java
@@ -28,9 +28,9 @@
 
 package org.jf.dexlib.debug;
 
+import org.jf.dexlib.ByteField;
 import org.jf.dexlib.CompositeField;
 import org.jf.dexlib.Field;
-import org.jf.dexlib.ByteField;
 
 public class SetPrologueEnd extends CompositeField<SetPrologueEnd> implements DebugInstruction<SetPrologueEnd> {
     public SetPrologueEnd() {
diff --git a/dexlib/src/main/java/org/jf/dexlib/debug/SpecialOpcode.java b/dexlib/src/main/java/org/jf/dexlib/debug/SpecialOpcode.java
index 9c858d74..9b84611f 100644
--- a/dexlib/src/main/java/org/jf/dexlib/debug/SpecialOpcode.java
+++ b/dexlib/src/main/java/org/jf/dexlib/debug/SpecialOpcode.java
@@ -28,9 +28,9 @@
 
 package org.jf.dexlib.debug;
 
+import org.jf.dexlib.ByteField;
 import org.jf.dexlib.CompositeField;
 import org.jf.dexlib.Field;
-import org.jf.dexlib.ByteField;
 
 public class SpecialOpcode extends CompositeField<SpecialOpcode> implements DebugInstruction<SpecialOpcode> {
     private final byte opcode;
diff --git a/dexlib/src/main/java/org/jf/dexlib/util/AccessFlags.java b/dexlib/src/main/java/org/jf/dexlib/util/AccessFlags.java
index 08bb4723..260d9f75 100644
--- a/dexlib/src/main/java/org/jf/dexlib/util/AccessFlags.java
+++ b/dexlib/src/main/java/org/jf/dexlib/util/AccessFlags.java
@@ -28,9 +28,9 @@
 
 package org.jf.dexlib.util;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-import java.util.ArrayList;
 
 public enum AccessFlags
 {
diff --git a/dexlib/src/main/java/org/jf/dexlib/util/DebugInfoBuilder.java b/dexlib/src/main/java/org/jf/dexlib/util/DebugInfoBuilder.java
index 7ce2442d..381eb82f 100644
--- a/dexlib/src/main/java/org/jf/dexlib/util/DebugInfoBuilder.java
+++ b/dexlib/src/main/java/org/jf/dexlib/util/DebugInfoBuilder.java
@@ -28,11 +28,11 @@
 
 package org.jf.dexlib.util;
 
-import org.jf.dexlib.debug.*;
-import org.jf.dexlib.DexFile;
 import org.jf.dexlib.DebugInfoItem;
+import org.jf.dexlib.DexFile;
 import org.jf.dexlib.StringIdItem;
 import org.jf.dexlib.TypeIdItem;
+import org.jf.dexlib.debug.*;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/dexlib/src/main/java/org/jf/dexlib/util/TryListBuilder.java b/dexlib/src/main/java/org/jf/dexlib/util/TryListBuilder.java
index 8ac5b419..94df69a1 100644
--- a/dexlib/src/main/java/org/jf/dexlib/util/TryListBuilder.java
+++ b/dexlib/src/main/java/org/jf/dexlib/util/TryListBuilder.java
@@ -28,11 +28,14 @@
 
 package org.jf.dexlib.util;
 
-import org.jf.dexlib.TypeIdItem;
 import org.jf.dexlib.CodeItem;
 import org.jf.dexlib.DexFile;
+import org.jf.dexlib.TypeIdItem;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
 
 public class TryListBuilder
 {
diff --git a/dexlib/src/main/java/org/jf/dexlib/util/TwoColumnOutput.java b/dexlib/src/main/java/org/jf/dexlib/util/TwoColumnOutput.java
index e507cace..9fc0a6bf 100644
--- a/dexlib/src/main/java/org/jf/dexlib/util/TwoColumnOutput.java
+++ b/dexlib/src/main/java/org/jf/dexlib/util/TwoColumnOutput.java
@@ -16,11 +16,7 @@
 
 package org.jf.dexlib.util;
 
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.StringWriter;
-import java.io.Writer;
+import java.io.*;
 
 /**
  * Class that takes a combined output destination and provides two
diff --git a/dexlib/src/main/java/org/jf/dexlib/util/TypeUtils.java b/dexlib/src/main/java/org/jf/dexlib/util/TypeUtils.java
index ebf69bd3..536b3131 100644
--- a/dexlib/src/main/java/org/jf/dexlib/util/TypeUtils.java
+++ b/dexlib/src/main/java/org/jf/dexlib/util/TypeUtils.java
@@ -28,8 +28,8 @@
 
 package org.jf.dexlib.util;
 
-import org.jf.dexlib.EncodedValue.*;
 import org.jf.dexlib.DexFile;
+import org.jf.dexlib.EncodedValue.*;
 
 public class TypeUtils
 {
diff --git a/dexlib/src/main/java/org/jf/dexlib/util/Utf8Utils.java b/dexlib/src/main/java/org/jf/dexlib/util/Utf8Utils.java
index f189be10..d0a45756 100644
--- a/dexlib/src/main/java/org/jf/dexlib/util/Utf8Utils.java
+++ b/dexlib/src/main/java/org/jf/dexlib/util/Utf8Utils.java
@@ -16,9 +16,6 @@
 
 package org.jf.dexlib.util;
 
-import org.jf.dexlib.util.ByteArray;
-import org.jf.dexlib.util.Hex;
-
 /**
  * Constants of type <code>CONSTANT_Utf8_info</code>.
  */
diff --git a/dexlib/src/test/java/TryListBuilderTest.java b/dexlib/src/test/java/TryListBuilderTest.java
index 6edd67ec..7d31d170 100644
--- a/dexlib/src/test/java/TryListBuilderTest.java
+++ b/dexlib/src/test/java/TryListBuilderTest.java
@@ -27,12 +27,13 @@
  */
 
 
-import org.jf.dexlib.util.TryListBuilder;
-import org.jf.dexlib.util.Pair;
-import org.jf.dexlib.TypeIdItem;
-import org.jf.dexlib.DexFile;
 import org.jf.dexlib.CodeItem;
-import org.junit.*;
+import org.jf.dexlib.DexFile;
+import org.jf.dexlib.TypeIdItem;
+import org.jf.dexlib.util.Pair;
+import org.jf.dexlib.util.TryListBuilder;
+import org.junit.Assert;
+import org.junit.Test;
 
 import java.util.List;
 
diff --git a/maven-smali-plugin/src/main/java/org/jf/SmaliMojo.java b/maven-smali-plugin/src/main/java/org/jf/SmaliMojo.java
index 2dd40df2..fc33bdef 100644
--- a/maven-smali-plugin/src/main/java/org/jf/SmaliMojo.java
+++ b/maven-smali-plugin/src/main/java/org/jf/SmaliMojo.java
@@ -20,12 +20,9 @@ package org.jf;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.project.MavenProject;
+import org.jf.smali.smali;
 
 import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-
-import org.jf.smali.smali;
 
 /**
  * Assembles files in the smali assembly language
diff --git a/smali/src/main/java/org/jf/smali/SemanticException.java b/smali/src/main/java/org/jf/smali/SemanticException.java
index d5c5e0f4..0fd53160 100644
--- a/smali/src/main/java/org/jf/smali/SemanticException.java
+++ b/smali/src/main/java/org/jf/smali/SemanticException.java
@@ -28,8 +28,8 @@
 
 package org.jf.smali;
 
-import org.antlr.runtime.RecognitionException;
 import org.antlr.runtime.IntStream;
+import org.antlr.runtime.RecognitionException;
 
 public class SemanticException extends RecognitionException {
     private String errorMessage;
diff --git a/smali/src/main/java/org/jf/smali/smali.java b/smali/src/main/java/org/jf/smali/smali.java
index 57606ab7..3d7de946 100644
--- a/smali/src/main/java/org/jf/smali/smali.java
+++ b/smali/src/main/java/org/jf/smali/smali.java
@@ -28,12 +28,12 @@
 
 package org.jf.smali;
 
-import org.jf.dexlib.DexFile;
-import org.jf.dexlib.util.ByteArrayAnnotatedOutput;
 import org.antlr.runtime.ANTLRInputStream;
 import org.antlr.runtime.CommonTokenStream;
 import org.antlr.runtime.tree.CommonTree;
 import org.antlr.runtime.tree.CommonTreeNodeStream;
+import org.jf.dexlib.DexFile;
+import org.jf.dexlib.util.ByteArrayAnnotatedOutput;
 
 import java.io.*;
 import java.util.LinkedHashSet;
diff --git a/smali/src/test/java/ByteLiteralTest.java b/smali/src/test/java/ByteLiteralTest.java
index f85b8c53..42609e30 100644
--- a/smali/src/test/java/ByteLiteralTest.java
+++ b/smali/src/test/java/ByteLiteralTest.java
@@ -26,8 +26,9 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import org.junit.*;
 import org.jf.smali.literalTools;
+import org.junit.Assert;
+import org.junit.Test;
 
 public class ByteLiteralTest
 {
diff --git a/smali/src/test/java/IntLiteralTest.java b/smali/src/test/java/IntLiteralTest.java
index 84895f00..eb7dbc8d 100644
--- a/smali/src/test/java/IntLiteralTest.java
+++ b/smali/src/test/java/IntLiteralTest.java
@@ -26,8 +26,9 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import org.junit.*;
 import org.jf.smali.literalTools;
+import org.junit.Assert;
+import org.junit.Test;
 
 public class IntLiteralTest
 {
diff --git a/smali/src/test/java/LongLiteralTest.java b/smali/src/test/java/LongLiteralTest.java
index 59dad74f..cf749de7 100644
--- a/smali/src/test/java/LongLiteralTest.java
+++ b/smali/src/test/java/LongLiteralTest.java
@@ -26,8 +26,9 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import org.junit.*;
 import org.jf.smali.literalTools;
+import org.junit.Assert;
+import org.junit.Test;
 
 public class LongLiteralTest
 {
diff --git a/smali/src/test/java/ShortLiteralTest.java b/smali/src/test/java/ShortLiteralTest.java
index b2da8082..16d1553e 100644
--- a/smali/src/test/java/ShortLiteralTest.java
+++ b/smali/src/test/java/ShortLiteralTest.java
@@ -26,8 +26,9 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import org.junit.*;
 import org.jf.smali.literalTools;
+import org.junit.Assert;
+import org.junit.Test;
 
 public class ShortLiteralTest
 {