diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/AaptInvoker.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/AaptInvoker.java
index 18567ed3..7aaad3d0 100644
--- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/AaptInvoker.java
+++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/AaptInvoker.java
@@ -32,17 +32,14 @@ import java.util.Objects;
 import java.util.logging.Logger;
 
 public class AaptInvoker {
-
     private final Config mConfig;
     private final ApkInfo mApkInfo;
-    private final File mApkDir;
 
     private final static Logger LOGGER = Logger.getLogger(AaptInvoker.class.getName());
 
-    public AaptInvoker(Config config, ApkInfo apkInfo, File apkDir) {
+    public AaptInvoker(Config config, ApkInfo apkInfo) {
         mConfig = config;
         mApkInfo = apkInfo;
-        mApkDir = apkDir;
     }
 
     private File getAaptBinaryFile() throws AndrolibException {
@@ -386,5 +383,4 @@ public class AaptInvoker {
         }
         invokeAapt1(apkFile, manifest, resDir, rawDir, assetDir, include, cmd, customAapt);
     }
-
 }
diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/ApkBuilder.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/ApkBuilder.java
index 299e2e3f..d2703341 100644
--- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/ApkBuilder.java
+++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/ApkBuilder.java
@@ -177,7 +177,7 @@ public class ApkBuilder {
                     }
                 }
             }
-        } catch(DirectoryException ex) {
+        } catch (DirectoryException ex) {
             throw new AndrolibException(ex);
         }
     }
@@ -302,7 +302,7 @@ public class ApkBuilder {
                 if (!ninePatch.exists()) {
                     ninePatch = null;
                 }
-                AaptInvoker invoker = new AaptInvoker(mConfig, mApkInfo, apkDir);
+                AaptInvoker invoker = new AaptInvoker(mConfig, mApkInfo);
                 invoker.invokeAapt(apkFile, new File(appDir,
                                 "AndroidManifest.xml"), new File(appDir, "res"),
                         ninePatch, null, parseUsesFramework(usesFramework));
@@ -370,7 +370,7 @@ public class ApkBuilder {
                     ninePatch = null;
                 }
 
-                AaptInvoker invoker = new AaptInvoker(mConfig, mApkInfo, apkDir);
+                AaptInvoker invoker = new AaptInvoker(mConfig, mApkInfo);
                 invoker.invokeAapt(apkFile, new File(appDir,
                                 "AndroidManifest.xml"), null, ninePatch, null,
                         parseUsesFramework(usesFramework));
diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/ApkDecoder.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/ApkDecoder.java
index f5a33b8b..bbd59f89 100644
--- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/ApkDecoder.java
+++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/ApkDecoder.java
@@ -38,7 +38,6 @@ import java.util.logging.Logger;
 import java.util.regex.Pattern;
 
 public class ApkDecoder {
-
     private final static Logger LOGGER = Logger.getLogger(ApkDecoder.class.getName());
 
     private final Config mConfig;
@@ -46,7 +45,6 @@ public class ApkDecoder {
     protected final ResUnknownFiles mResUnknownFiles;
     private int mMinSdkVersion = 0;
 
-
     private final static String SMALI_DIRNAME = "smali";
     private final static String UNK_DIRNAME = "unknown";
     private final static String[] APK_STANDARD_ALL_FILENAMES = new String[] {
diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/ApktoolProperties.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/ApktoolProperties.java
index 265eff56..515e5ee1 100644
--- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/ApktoolProperties.java
+++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/ApktoolProperties.java
@@ -22,6 +22,10 @@ import java.util.Properties;
 import java.util.logging.Logger;
 
 public class ApktoolProperties {
+    private static final Logger LOGGER = Logger.getLogger(ApktoolProperties.class.getName());
+
+    private static Properties sProps;
+
     public static String get(String key) {
         return get().getProperty(key);
     }
@@ -83,8 +87,4 @@ public class ApktoolProperties {
         }
         sProps.put("smaliVersion", version);
     }
-
-    private static Properties sProps;
-
-    private static final Logger LOGGER = Logger.getLogger(ApktoolProperties.class.getName());
 }
diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/Config.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/Config.java
index 68ba9728..9aad41e1 100644
--- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/Config.java
+++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/Config.java
@@ -23,7 +23,6 @@ import java.io.File;
 import java.util.logging.Logger;
 
 public class Config {
-
     private final static Logger LOGGER = Logger.getLogger(Config.class.getName());
 
     public final static short DECODE_SOURCES_NONE = 0x0000;
diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/ResourcesDecoder.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/ResourcesDecoder.java
index 5cda1644..f065257e 100644
--- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/ResourcesDecoder.java
+++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/ResourcesDecoder.java
@@ -41,7 +41,6 @@ import java.util.Map;
 import java.util.logging.Logger;
 
 public class ResourcesDecoder {
-
     private final static Logger LOGGER = Logger.getLogger(ResourcesDecoder.class.getName());
 
     private final Config mConfig;
@@ -355,5 +354,4 @@ public class ResourcesDecoder {
             throw new AndrolibException("Could not generate public.xml file", ex);
         }
     }
-
 }
diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ninepatch/NinePatchData.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ninepatch/NinePatchData.java
index 4cde7304..28d5f4f4 100644
--- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ninepatch/NinePatchData.java
+++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ninepatch/NinePatchData.java
@@ -19,8 +19,7 @@ package brut.androlib.res.data.ninepatch;
 import brut.util.ExtDataInput;
 import java.io.IOException;
 
-public class NinePatchData
-{
+public class NinePatchData {
     public final int padLeft, padRight, padTop, padBottom;
     public final int[] xDivs, yDivs;
 
diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResArrayValue.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResArrayValue.java
index 231c4eac..732d2e2d 100644
--- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResArrayValue.java
+++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResArrayValue.java
@@ -25,9 +25,7 @@ import org.xmlpull.v1.XmlSerializer;
 import java.io.IOException;
 import java.util.Arrays;
 
-public class ResArrayValue extends ResBagValue implements
-        ResValuesXmlSerializable {
-
+public class ResArrayValue extends ResBagValue implements ResValuesXmlSerializable {
     ResArrayValue(ResReferenceValue parent, Duo<Integer, ResScalarValue>[] items) {
         super(parent);