26 files changed, 142 insertions, 119 deletions

diff --git a/src/test/java/cuchaz/enigma/inputs/Keep.java b/src/test/java/cuchaz/enigma/inputs/Keep.java
index f04875f..4dbe8e2 100644
--- a/src/test/java/cuchaz/enigma/inputs/Keep.java
+++ b/src/test/java/cuchaz/enigma/inputs/Keep.java
@@ -4,10 +4,11 @@
  * are made available under the terms of the GNU Lesser General Public
  * License v3.0 which accompanies this distribution, and is available at
  * http://www.gnu.org/licenses/lgpl.html
- * 
+ *
  * Contributors:
  *     Jeff Martin - initial API and implementation
  ******************************************************************************/
+
 package cuchaz.enigma.inputs;
 
 public class Keep {
diff --git a/src/test/java/cuchaz/enigma/inputs/constructors/BaseClass.java b/src/test/java/cuchaz/enigma/inputs/constructors/BaseClass.java
index ad5e950..f07e1f8 100644
--- a/src/test/java/cuchaz/enigma/inputs/constructors/BaseClass.java
+++ b/src/test/java/cuchaz/enigma/inputs/constructors/BaseClass.java
@@ -4,20 +4,21 @@
  * are made available under the terms of the GNU Lesser General Public
  * License v3.0 which accompanies this distribution, and is available at
  * http://www.gnu.org/licenses/lgpl.html
- * 
+ *
  * Contributors:
  *     Jeff Martin - initial API and implementation
  ******************************************************************************/
+
 package cuchaz.enigma.inputs.constructors;
 
 // a
 public class BaseClass {
-        
+
         // <init>()V
         public BaseClass() {
                 System.out.println("Default constructor");
         }
-        
+
         // <init>(I)V
         public BaseClass(int i) {
                 System.out.println("Int constructor " + i);
diff --git a/src/test/java/cuchaz/enigma/inputs/constructors/Caller.java b/src/test/java/cuchaz/enigma/inputs/constructors/Caller.java
index dcd9617..71439fd 100644
--- a/src/test/java/cuchaz/enigma/inputs/constructors/Caller.java
+++ b/src/test/java/cuchaz/enigma/inputs/constructors/Caller.java
@@ -4,51 +4,52 @@
  * are made available under the terms of the GNU Lesser General Public
  * License v3.0 which accompanies this distribution, and is available at
  * http://www.gnu.org/licenses/lgpl.html
- * 
+ *
  * Contributors:
  *     Jeff Martin - initial API and implementation
  ******************************************************************************/
+
 package cuchaz.enigma.inputs.constructors;
 
 // b
 public class Caller {
-        
+
         // a()V
         public void callBaseDefault() {
                 // a.<init>()V
                 System.out.println(new BaseClass());
         }
-        
+
         // b()V
         public void callBaseInt() {
                 // a.<init>(I)V
                 System.out.println(new BaseClass(5));
         }
-        
+
         // c()V
         public void callSubDefault() {
                 // d.<init>()V
                 System.out.println(new SubClass());
         }
-        
+
         // d()V
         public void callSubInt() {
                 // d.<init>(I)V
                 System.out.println(new SubClass(6));
         }
-        
+
         // e()V
         public void callSubIntInt() {
                 // d.<init>(II)V
                 System.out.println(new SubClass(4, 2));
         }
-        
+
         // f()V
         public void callSubSubInt() {
                 // e.<init>(I)V
                 System.out.println(new SubSubClass(3));
         }
-        
+
         // g()V
         public void callDefaultConstructable() {
                 // c.<init>()V
diff --git a/src/test/java/cuchaz/enigma/inputs/constructors/DefaultConstructable.java b/src/test/java/cuchaz/enigma/inputs/constructors/DefaultConstructable.java
index 655f4da..c3d4170 100644
--- a/src/test/java/cuchaz/enigma/inputs/constructors/DefaultConstructable.java
+++ b/src/test/java/cuchaz/enigma/inputs/constructors/DefaultConstructable.java
@@ -4,10 +4,11 @@
  * are made available under the terms of the GNU Lesser General Public
  * License v3.0 which accompanies this distribution, and is available at
  * http://www.gnu.org/licenses/lgpl.html
- * 
+ *
  * Contributors:
  *     Jeff Martin - initial API and implementation
  ******************************************************************************/
+
 package cuchaz.enigma.inputs.constructors;
 
 public class DefaultConstructable {
diff --git a/src/test/java/cuchaz/enigma/inputs/constructors/SubClass.java b/src/test/java/cuchaz/enigma/inputs/constructors/SubClass.java
index b2934a2..bc56b3b 100644
--- a/src/test/java/cuchaz/enigma/inputs/constructors/SubClass.java
+++ b/src/test/java/cuchaz/enigma/inputs/constructors/SubClass.java
@@ -4,33 +4,34 @@
  * are made available under the terms of the GNU Lesser General Public
  * License v3.0 which accompanies this distribution, and is available at
  * http://www.gnu.org/licenses/lgpl.html
- * 
+ *
  * Contributors:
  *     Jeff Martin - initial API and implementation
  ******************************************************************************/
+
 package cuchaz.enigma.inputs.constructors;
 
 // d extends a
 public class SubClass extends BaseClass {
-        
+
         // <init>()V
         public SubClass() {
                 // a.<init>()V
         }
-        
+
         // <init>(I)V
         public SubClass(int num) {
                 // <init>()V
                 this();
                 System.out.println("SubClass " + num);
         }
-        
+
         // <init>(II)V
         public SubClass(int a, int b) {
                 // <init>(I)V
                 this(a + b);
         }
-        
+
         // <init>(III)V
         public SubClass(int a, int b, int c) {
                 // a.<init>()V
diff --git a/src/test/java/cuchaz/enigma/inputs/constructors/SubSubClass.java b/src/test/java/cuchaz/enigma/inputs/constructors/SubSubClass.java
index c1725fe..87b69d3 100644
--- a/src/test/java/cuchaz/enigma/inputs/constructors/SubSubClass.java
+++ b/src/test/java/cuchaz/enigma/inputs/constructors/SubSubClass.java
@@ -4,15 +4,16 @@
  * are made available under the terms of the GNU Lesser General Public
  * License v3.0 which accompanies this distribution, and is available at
  * http://www.gnu.org/licenses/lgpl.html
- * 
+ *
  * Contributors:
  *     Jeff Martin - initial API and implementation
  ******************************************************************************/
+
 package cuchaz.enigma.inputs.constructors;
 
 // e extends d
 public class SubSubClass extends SubClass {
-        
+
         // <init>(I)V
         public SubSubClass(int i) {
                 // c.<init>(I)V
diff --git a/src/test/java/cuchaz/enigma/inputs/inheritanceTree/BaseClass.java b/src/test/java/cuchaz/enigma/inputs/inheritanceTree/BaseClass.java
index 1b1f369..b9c4929 100644
--- a/src/test/java/cuchaz/enigma/inputs/inheritanceTree/BaseClass.java
+++ b/src/test/java/cuchaz/enigma/inputs/inheritanceTree/BaseClass.java
@@ -4,28 +4,29 @@
  * are made available under the terms of the GNU Lesser General Public
  * License v3.0 which accompanies this distribution, and is available at
  * http://www.gnu.org/licenses/lgpl.html
- * 
+ *
  * Contributors:
  *     Jeff Martin - initial API and implementation
  ******************************************************************************/
+
 package cuchaz.enigma.inputs.inheritanceTree;
 
 // a
 public abstract class BaseClass {
-        
+
         // a
         private String name;
-        
+
         // <init>(Ljava/lang/String;)V
         protected BaseClass(String name) {
                 this.name = name;
         }
-        
+
         // a()Ljava/lang/String;
         public String getName() {
                 return name;
         }
-        
+
         // a()V
         public abstract void doBaseThings();
 }
diff --git a/src/test/java/cuchaz/enigma/inputs/inheritanceTree/SubclassA.java b/src/test/java/cuchaz/enigma/inputs/inheritanceTree/SubclassA.java
index d0213a3..50e963c 100644
--- a/src/test/java/cuchaz/enigma/inputs/inheritanceTree/SubclassA.java
+++ b/src/test/java/cuchaz/enigma/inputs/inheritanceTree/SubclassA.java
@@ -4,15 +4,16 @@
  * are made available under the terms of the GNU Lesser General Public
  * License v3.0 which accompanies this distribution, and is available at
  * http://www.gnu.org/licenses/lgpl.html
- * 
+ *
  * Contributors:
  *     Jeff Martin - initial API and implementation
  ******************************************************************************/
+
 package cuchaz.enigma.inputs.inheritanceTree;
 
 // b extends a
 public abstract class SubclassA extends BaseClass {
-        
+
         // <init>(Ljava/lang/String;)V
         protected SubclassA(String name) {
                 // call to a.<init>(Ljava/lang/String)V
diff --git a/src/test/java/cuchaz/enigma/inputs/inheritanceTree/SubclassB.java b/src/test/java/cuchaz/enigma/inputs/inheritanceTree/SubclassB.java
index 6d3b0d0..d0dd664 100644
--- a/src/test/java/cuchaz/enigma/inputs/inheritanceTree/SubclassB.java
+++ b/src/test/java/cuchaz/enigma/inputs/inheritanceTree/SubclassB.java
@@ -4,34 +4,35 @@
  * are made available under the terms of the GNU Lesser General Public
  * License v3.0 which accompanies this distribution, and is available at
  * http://www.gnu.org/licenses/lgpl.html
- * 
+ *
  * Contributors:
  *     Jeff Martin - initial API and implementation
  ******************************************************************************/
+
 package cuchaz.enigma.inputs.inheritanceTree;
 
 // c extends a
 public class SubclassB extends BaseClass {
-        
+
         // a
         private int numThings;
-        
+
         // <init>()V
         protected SubclassB() {
                 // a.<init>(Ljava/lang/String;)V
                 super("B");
-                
+
                 // access to a
                 numThings = 4;
         }
-        
+
         @Override
         // a()V
         public void doBaseThings() {
                 // call to a.a()Ljava/lang/String;
                 System.out.println("Base things by B! " + getName());
         }
-        
+
         // b()V
         public void doBThings() {
                 // access to a
diff --git a/src/test/java/cuchaz/enigma/inputs/inheritanceTree/SubsubclassAA.java b/src/test/java/cuchaz/enigma/inputs/inheritanceTree/SubsubclassAA.java
index a5b25fd..c584570 100644
--- a/src/test/java/cuchaz/enigma/inputs/inheritanceTree/SubsubclassAA.java
+++ b/src/test/java/cuchaz/enigma/inputs/inheritanceTree/SubsubclassAA.java
@@ -4,27 +4,28 @@
  * are made available under the terms of the GNU Lesser General Public
  * License v3.0 which accompanies this distribution, and is available at
  * http://www.gnu.org/licenses/lgpl.html
- * 
+ *
  * Contributors:
  *     Jeff Martin - initial API and implementation
  ******************************************************************************/
+
 package cuchaz.enigma.inputs.inheritanceTree;
 
 // d extends b
 public class SubsubclassAA extends SubclassA {
-        
+
         protected SubsubclassAA() {
                 // call to b.<init>(Ljava/lang/String;)V
                 super("AA");
         }
-        
+
         @Override
         // a()Ljava/lang/String;
         public String getName() {
                 // call to b.a()Ljava/lang/String;
                 return "subsub" + super.getName();
         }
-        
+
         @Override
         // a()V
         public void doBaseThings() {
diff --git a/src/test/java/cuchaz/enigma/inputs/innerClasses/A_Anonymous.java b/src/test/java/cuchaz/enigma/inputs/innerClasses/A_Anonymous.java
index f644439..f652d87 100644
--- a/src/test/java/cuchaz/enigma/inputs/innerClasses/A_Anonymous.java
+++ b/src/test/java/cuchaz/enigma/inputs/innerClasses/A_Anonymous.java
@@ -4,14 +4,15 @@
  * are made available under the terms of the GNU Lesser General Public
  * License v3.0 which accompanies this distribution, and is available at
  * http://www.gnu.org/licenses/lgpl.html
- * 
+ *
  * Contributors:
  *     Jeff Martin - initial API and implementation
  ******************************************************************************/
+
 package cuchaz.enigma.inputs.innerClasses;
 
 public class A_Anonymous {
-        
+
         public void foo() {
                 Runnable runnable = new Runnable() {
                         @Override
diff --git a/src/test/java/cuchaz/enigma/inputs/innerClasses/B_AnonymousWithScopeArgs.java b/src/test/java/cuchaz/enigma/inputs/innerClasses/B_AnonymousWithScopeArgs.java
index d78be84..d1b7601 100644
--- a/src/test/java/cuchaz/enigma/inputs/innerClasses/B_AnonymousWithScopeArgs.java
+++ b/src/test/java/cuchaz/enigma/inputs/innerClasses/B_AnonymousWithScopeArgs.java
@@ -4,14 +4,15 @@
  * are made available under the terms of the GNU Lesser General Public
  * License v3.0 which accompanies this distribution, and is available at
  * http://www.gnu.org/licenses/lgpl.html
- * 
+ *
  * Contributors:
  *     Jeff Martin - initial API and implementation
  ******************************************************************************/
+
 package cuchaz.enigma.inputs.innerClasses;
 
 public class B_AnonymousWithScopeArgs {
-        
+
         public static void foo(final D_Simple arg) {
                 System.out.println(new Object() {
                         @Override
diff --git a/src/test/java/cuchaz/enigma/inputs/innerClasses/C_ConstructorArgs.java b/src/test/java/cuchaz/enigma/inputs/innerClasses/C_ConstructorArgs.java
index eb03489..94061fa 100644
--- a/src/test/java/cuchaz/enigma/inputs/innerClasses/C_ConstructorArgs.java
+++ b/src/test/java/cuchaz/enigma/inputs/innerClasses/C_ConstructorArgs.java
@@ -4,27 +4,28 @@
  * are made available under the terms of the GNU Lesser General Public
  * License v3.0 which accompanies this distribution, and is available at
  * http://www.gnu.org/licenses/lgpl.html
- * 
+ *
  * Contributors:
  *     Jeff Martin - initial API and implementation
  ******************************************************************************/
+
 package cuchaz.enigma.inputs.innerClasses;
 
 @SuppressWarnings("unused")
 public class C_ConstructorArgs {
-        
+
+        Inner i;
+
+        public void foo() {
+                i = new Inner(5);
+        }
+
         class Inner {
-                
+
                 private int a;
-                
+
                 public Inner(int a) {
                         this.a = a;
                 }
         }
-        
-        Inner i;
-        
-        public void foo() {
-                i = new Inner(5);
-        }
 }
diff --git a/src/test/java/cuchaz/enigma/inputs/innerClasses/D_Simple.java b/src/test/java/cuchaz/enigma/inputs/innerClasses/D_Simple.java
index 0e9bf82..71b3a6d 100644
--- a/src/test/java/cuchaz/enigma/inputs/innerClasses/D_Simple.java
+++ b/src/test/java/cuchaz/enigma/inputs/innerClasses/D_Simple.java
@@ -4,14 +4,15 @@
  * are made available under the terms of the GNU Lesser General Public
  * License v3.0 which accompanies this distribution, and is available at
  * http://www.gnu.org/licenses/lgpl.html
- * 
+ *
  * Contributors:
  *     Jeff Martin - initial API and implementation
  ******************************************************************************/
+
 package cuchaz.enigma.inputs.innerClasses;
 
 public class D_Simple {
-        
+
         class Inner {
                 // nothing to do
         }
diff --git a/src/test/java/cuchaz/enigma/inputs/innerClasses/E_AnonymousWithOuterAccess.java b/src/test/java/cuchaz/enigma/inputs/innerClasses/E_AnonymousWithOuterAccess.java
index 255434d..976ec42 100644
--- a/src/test/java/cuchaz/enigma/inputs/innerClasses/E_AnonymousWithOuterAccess.java
+++ b/src/test/java/cuchaz/enigma/inputs/innerClasses/E_AnonymousWithOuterAccess.java
@@ -4,17 +4,18 @@
  * are made available under the terms of the GNU Lesser General Public
  * License v3.0 which accompanies this distribution, and is available at
  * http://www.gnu.org/licenses/lgpl.html
- * 
+ *
  * Contributors:
  *     Jeff Martin - initial API and implementation
  ******************************************************************************/
+
 package cuchaz.enigma.inputs.innerClasses;
 
 public class E_AnonymousWithOuterAccess {
-        
+
         // reproduction of error case documented at:
         // https://bitbucket.org/cuchaz/enigma/issue/61/stackoverflowerror-when-deobfuscating
-        
+
         public Object makeInner() {
                 outerMethod();
                 return new Object() {
@@ -24,7 +25,7 @@ public class E_AnonymousWithOuterAccess {
                         }
                 };
         }
-        
+
         private String outerMethod() {
                 return "foo";
         }
diff --git a/src/test/java/cuchaz/enigma/inputs/innerClasses/F_ClassTree.java b/src/test/java/cuchaz/enigma/inputs/innerClasses/F_ClassTree.java
index 7d1dab4..b1de3c9 100644
--- a/src/test/java/cuchaz/enigma/inputs/innerClasses/F_ClassTree.java
+++ b/src/test/java/cuchaz/enigma/inputs/innerClasses/F_ClassTree.java
@@ -4,25 +4,25 @@
  * are made available under the terms of the GNU Lesser General Public
  * License v3.0 which accompanies this distribution, and is available at
  * http://www.gnu.org/licenses/lgpl.html
- * 
+ *
  * Contributors:
  *     Jeff Martin - initial API and implementation
  ******************************************************************************/
-package cuchaz.enigma.inputs.innerClasses;
 
+package cuchaz.enigma.inputs.innerClasses;
 
 public class F_ClassTree {
-        
+
         public class Level1 {
-                
+
                 public int f1;
-                
+
                 public class Level2 {
-                        
+
                         public int f2;
-                        
+
                         public class Level3 {
-                                
+
                                 public int f3;
                         }
                 }
diff --git a/src/test/java/cuchaz/enigma/inputs/loneClass/LoneClass.java b/src/test/java/cuchaz/enigma/inputs/loneClass/LoneClass.java
index d28ae97..ddc4e31 100644
--- a/src/test/java/cuchaz/enigma/inputs/loneClass/LoneClass.java
+++ b/src/test/java/cuchaz/enigma/inputs/loneClass/LoneClass.java
@@ -4,20 +4,21 @@
  * are made available under the terms of the GNU Lesser General Public
  * License v3.0 which accompanies this distribution, and is available at
  * http://www.gnu.org/licenses/lgpl.html
- * 
+ *
  * Contributors:
  *     Jeff Martin - initial API and implementation
  ******************************************************************************/
+
 package cuchaz.enigma.inputs.loneClass;
 
 public class LoneClass {
-        
+
         private String name;
-        
+
         public LoneClass(String name) {
                 this.name = name;
         }
-        
+
         public String getName() {
                 return name;
         }
diff --git a/src/test/java/cuchaz/enigma/inputs/translation/A_Basic.java b/src/test/java/cuchaz/enigma/inputs/translation/A_Basic.java
index 26acac8..26f3718 100644
--- a/src/test/java/cuchaz/enigma/inputs/translation/A_Basic.java
+++ b/src/test/java/cuchaz/enigma/inputs/translation/A_Basic.java
@@ -4,28 +4,29 @@
  * are made available under the terms of the GNU Lesser General Public
  * License v3.0 which accompanies this distribution, and is available at
  * http://www.gnu.org/licenses/lgpl.html
- * 
+ *
  * Contributors:
  *     Jeff Martin - initial API and implementation
  ******************************************************************************/
+
 package cuchaz.enigma.inputs.translation;
 
 public class A_Basic {
-        
+
         public int one;
         public float two;
         public String three;
-        
+
         public void m1() {
         }
-        
+
         public int m2() {
                 return 42;
         }
-        
+
         public void m3(int a1) {
         }
-        
+
         public int m4(int a1) {
                 return 5; // chosen by fair die roll, guaranteed to be random
         }
diff --git a/src/test/java/cuchaz/enigma/inputs/translation/B_BaseClass.java b/src/test/java/cuchaz/enigma/inputs/translation/B_BaseClass.java
index 035e329..fd7f6e7 100644
--- a/src/test/java/cuchaz/enigma/inputs/translation/B_BaseClass.java
+++ b/src/test/java/cuchaz/enigma/inputs/translation/B_BaseClass.java
@@ -4,21 +4,22 @@
  * are made available under the terms of the GNU Lesser General Public
  * License v3.0 which accompanies this distribution, and is available at
  * http://www.gnu.org/licenses/lgpl.html
- * 
+ *
  * Contributors:
  *     Jeff Martin - initial API and implementation
  ******************************************************************************/
+
 package cuchaz.enigma.inputs.translation;
 
 public class B_BaseClass {
-        
+
         public int f1;
         public char f2;
-        
+
         public int m1() {
                 return 5;
         }
-        
+
         public int m2() {
                 return 42;
         }
diff --git a/src/test/java/cuchaz/enigma/inputs/translation/C_SubClass.java b/src/test/java/cuchaz/enigma/inputs/translation/C_SubClass.java
index 6026a8d..9d74e44 100644
--- a/src/test/java/cuchaz/enigma/inputs/translation/C_SubClass.java
+++ b/src/test/java/cuchaz/enigma/inputs/translation/C_SubClass.java
@@ -4,23 +4,24 @@
  * are made available under the terms of the GNU Lesser General Public
  * License v3.0 which accompanies this distribution, and is available at
  * http://www.gnu.org/licenses/lgpl.html
- * 
+ *
  * Contributors:
  *     Jeff Martin - initial API and implementation
  ******************************************************************************/
+
 package cuchaz.enigma.inputs.translation;
 
 public class C_SubClass extends B_BaseClass {
-        
+
         public char f2; // shadows B_BaseClass.f2
         public int f3;
         public int f4;
-        
+
         @Override
         public int m1() {
                 return 32;
         }
-        
+
         public int m3() {
                 return 7;
         }
diff --git a/src/test/java/cuchaz/enigma/inputs/translation/D_AnonymousTesting.java b/src/test/java/cuchaz/enigma/inputs/translation/D_AnonymousTesting.java
index a1827f9..99c83bb 100644
--- a/src/test/java/cuchaz/enigma/inputs/translation/D_AnonymousTesting.java
+++ b/src/test/java/cuchaz/enigma/inputs/translation/D_AnonymousTesting.java
@@ -4,17 +4,18 @@
  * are made available under the terms of the GNU Lesser General Public
  * License v3.0 which accompanies this distribution, and is available at
  * http://www.gnu.org/licenses/lgpl.html
- * 
+ *
  * Contributors:
  *     Jeff Martin - initial API and implementation
  ******************************************************************************/
+
 package cuchaz.enigma.inputs.translation;
 
 import java.util.ArrayList;
 import java.util.List;
 
 public class D_AnonymousTesting {
-        
+
         public List<Object> getObjs() {
                 List<Object> objs = new ArrayList<Object>();
                 objs.add(new Object() {
diff --git a/src/test/java/cuchaz/enigma/inputs/translation/E_Bridges.java b/src/test/java/cuchaz/enigma/inputs/translation/E_Bridges.java
index 769eb70..0b8cf2a 100644
--- a/src/test/java/cuchaz/enigma/inputs/translation/E_Bridges.java
+++ b/src/test/java/cuchaz/enigma/inputs/translation/E_Bridges.java
@@ -4,15 +4,15 @@
  * are made available under the terms of the GNU Lesser General Public
  * License v3.0 which accompanies this distribution, and is available at
  * http://www.gnu.org/licenses/lgpl.html
- * 
+ *
  * Contributors:
  *     Jeff Martin - initial API and implementation
  ******************************************************************************/
+
 package cuchaz.enigma.inputs.translation;
 
 import java.util.Iterator;
 
-
 public class E_Bridges implements Iterator<Object> {
 
         @Override
diff --git a/src/test/java/cuchaz/enigma/inputs/translation/F_ObjectMethods.java b/src/test/java/cuchaz/enigma/inputs/translation/F_ObjectMethods.java
index 845d62b..8a92792 100644
--- a/src/test/java/cuchaz/enigma/inputs/translation/F_ObjectMethods.java
+++ b/src/test/java/cuchaz/enigma/inputs/translation/F_ObjectMethods.java
@@ -4,17 +4,18 @@
  * are made available under the terms of the GNU Lesser General Public
  * License v3.0 which accompanies this distribution, and is available at
  * http://www.gnu.org/licenses/lgpl.html
- * 
+ *
  * Contributors:
  *     Jeff Martin - initial API and implementation
  ******************************************************************************/
+
 package cuchaz.enigma.inputs.translation;
 
 @SuppressWarnings("FinalizeCalledExplicitly")
 public class F_ObjectMethods {
-        
+
         public void callEmAll()
-        throws Throwable {
+                throws Throwable {
                 clone();
                 equals(this);
                 finalize();
diff --git a/src/test/java/cuchaz/enigma/inputs/translation/G_OuterClass.java b/src/test/java/cuchaz/enigma/inputs/translation/G_OuterClass.java
index a2e0daf..a1e6a85 100644
--- a/src/test/java/cuchaz/enigma/inputs/translation/G_OuterClass.java
+++ b/src/test/java/cuchaz/enigma/inputs/translation/G_OuterClass.java
@@ -4,30 +4,30 @@
  * are made available under the terms of the GNU Lesser General Public
  * License v3.0 which accompanies this distribution, and is available at
  * http://www.gnu.org/licenses/lgpl.html
- * 
+ *
  * Contributors:
  *     Jeff Martin - initial API and implementation
  ******************************************************************************/
-package cuchaz.enigma.inputs.translation;
 
+package cuchaz.enigma.inputs.translation;
 
 public class G_OuterClass {
-        
+
         public class A_InnerClass {
-                
+
                 public int f1;
                 public String f2;
-                
+
                 public void m1() {}
-                
+
                 public class A_InnerInnerClass {
-                        
+
                         public int f3;
-                        
+
                         public void m2() {}
                 }
         }
-        
+
         public class B_NamelessClass {
                 public class A_NamedInnerClass {
                         public int f4;
diff --git a/src/test/java/cuchaz/enigma/inputs/translation/H_NamelessClass.java b/src/test/java/cuchaz/enigma/inputs/translation/H_NamelessClass.java
index 1b718a5..013c55a 100644
--- a/src/test/java/cuchaz/enigma/inputs/translation/H_NamelessClass.java
+++ b/src/test/java/cuchaz/enigma/inputs/translation/H_NamelessClass.java
@@ -4,34 +4,36 @@
  * are made available under the terms of the GNU Lesser General Public
  * License v3.0 which accompanies this distribution, and is available at
  * http://www.gnu.org/licenses/lgpl.html
- * 
+ *
  * Contributors:
  *     Jeff Martin - initial API and implementation
  ******************************************************************************/
-package cuchaz.enigma.inputs.translation;
 
+package cuchaz.enigma.inputs.translation;
 
 public class H_NamelessClass {
-        
+
         public class A_InnerClass {
-                
+
                 public int f1;
                 public String f2;
-                
+
                 public void m1() {}
-                
+
                 public class A_InnerInnerClass {
-                        
+
                         public int f3;
-                        
+
                         public void m2() {}
                 }
         }
-        
+
         public class B_NamelessClass {
                 public class A_NamedInnerClass {
                         public int f4;
+
                         public class A_AnotherInnerClass {}
+
                         public class B_YetAnotherInnerClass {}
                 }
         }
diff --git a/src/test/java/cuchaz/enigma/inputs/translation/I_Generics.java b/src/test/java/cuchaz/enigma/inputs/translation/I_Generics.java
index 3490f9d..fd2ebdd 100644
--- a/src/test/java/cuchaz/enigma/inputs/translation/I_Generics.java
+++ b/src/test/java/cuchaz/enigma/inputs/translation/I_Generics.java
@@ -4,32 +4,32 @@
  * are made available under the terms of the GNU Lesser General Public
  * License v3.0 which accompanies this distribution, and is available at
  * http://www.gnu.org/licenses/lgpl.html
- * 
+ *
  * Contributors:
  *     Jeff Martin - initial API and implementation
  ******************************************************************************/
+
 package cuchaz.enigma.inputs.translation;
 
 import java.util.List;
 import java.util.Map;
 
-
 public class I_Generics {
-        
-        public class A_Type {
-        }
-        
+
         public List<Integer> f1;
         public List<A_Type> f2;
-        public Map<A_Type,A_Type> f3;
-        
+        public Map<A_Type, A_Type> f3;
+        public B_Generic<Integer> f5;
+        public B_Generic<A_Type> f6;
+
+        public class A_Type {
+        }
+
         public class B_Generic<T> {
                 public T f4;
+
                 public T m1() {
                         return null;
                 }
         }
-        
-        public B_Generic<Integer> f5;
-        public B_Generic<A_Type> f6;
 }