diff --git a/src/main/java/refinedstorage/tile/TileDiskManipulator.java b/src/main/java/refinedstorage/tile/TileDiskManipulator.java
index 27ab7703b..b28903da3 100644
--- a/src/main/java/refinedstorage/tile/TileDiskManipulator.java
+++ b/src/main/java/refinedstorage/tile/TileDiskManipulator.java
@@ -51,7 +51,7 @@ public class TileDiskManipulator extends TileNode implements IComparable, IFilte
     private static final String NBT_COMPARE = "Compare";
     private static final String NBT_MODE = "Mode";
     private static final String NBT_TYPE = "Type";
-    private static final String NBT_IO_MOD = "IOMode";
+    private static final String NBT_IO_MODE = "IOMode";
 
     private int compare = 0;
     private int mode = IFilterable.WHITELIST;
@@ -193,23 +193,23 @@ public class TileDiskManipulator extends TileNode implements IComparable, IFilte
             return;
         }
         ItemStack extracted = null;
-        int ii = 0;
+        int i = 0;
         do {
             ItemStack stack = null;
-            while (storage.getItems().size() > ii && stack == null) {
-                stack = storage.getItems().get(ii++);
+            while (storage.getItems().size() > i && stack == null) {
+                stack = storage.getItems().get(i++);
             }
             if (stack != null) {
                 extracted = storage.extractItem(stack, 1, compare);
             }
-        } while (storage.getItems().size() > ii && extracted == null);
+        } while (storage.getItems().size() > i && extracted == null);
         if (extracted == null) {
             moveDriveToOutput(slot);
             return;
         }
-        ItemStack leftOver = network.insertItem(extracted, extracted.stackSize, false);
-        if (leftOver != null) {
-            storage.insertItem(leftOver, leftOver.stackSize, false);
+        ItemStack remainder = network.insertItem(extracted, extracted.stackSize, false);
+        if (remainder != null) {
+            storage.insertItem(remainder, remainder.stackSize, false);
         }
     }
 
@@ -219,7 +219,7 @@ public class TileDiskManipulator extends TileNode implements IComparable, IFilte
             return;
         }
         ItemStack extracted = null;
-        int ii = 0;
+        int i = 0;
         if (IFilterable.isEmpty(itemFilters)) {
             ItemStack toExtract = null;
             ArrayList<ItemStack> networkItems = new ArrayList<>(network.getItemStorage().getStacks());
@@ -231,10 +231,10 @@ public class TileDiskManipulator extends TileNode implements IComparable, IFilte
                 extracted = network.extractItem(toExtract, 1, compare);
             }
         } else {
-            while (itemFilters.getSlots() > ii && extracted == null) {
+            while (itemFilters.getSlots() > i && extracted == null) {
                 ItemStack stack = null;
-                while (itemFilters.getSlots() > ii && stack == null) {
-                    stack = itemFilters.getStackInSlot(ii++);
+                while (itemFilters.getSlots() > i && stack == null) {
+                    stack = itemFilters.getStackInSlot(i++);
                 }
                 if (stack != null) {
                     extracted = network.extractItem(stack, 1, compare);
@@ -246,9 +246,9 @@ public class TileDiskManipulator extends TileNode implements IComparable, IFilte
             moveDriveToOutput(slot);
             return;
         }
-        ItemStack leftOver = storage.insertItem(extracted, extracted.stackSize, false);
-        if (leftOver != null) {
-            network.insertItem(leftOver, leftOver.stackSize, false);
+        ItemStack remainder = storage.insertItem(extracted, extracted.stackSize, false);
+        if (remainder != null) {
+            network.insertItem(remainder, remainder.stackSize, false);
         }
     }
 
@@ -258,23 +258,23 @@ public class TileDiskManipulator extends TileNode implements IComparable, IFilte
             return;
         }
         FluidStack extracted = null;
-        int ii = 0;
+        int i = 0;
         do {
-            FluidStack stack = storage.getStacks().get(ii);
-            while (stack == null && storage.getStacks().size() > ii) {
-                ii++;
+            FluidStack stack = storage.getStacks().get(i);
+            while (stack == null && storage.getStacks().size() > i) {
+                i++;
             }
             if (stack != null) {
                 extracted = storage.extractFluid(stack, 1, compare);
             }
-        } while (extracted == null && storage.getStacks().size() > ii);
+        } while (extracted == null && storage.getStacks().size() > i);
         if (extracted == null) {
             moveDriveToOutput(slot);
             return;
         }
-        FluidStack leftOver = network.insertFluid(extracted, extracted.amount, false);
-        if (leftOver != null) {
-            storage.insertFluid(leftOver, leftOver.amount, false);
+        FluidStack remainder = network.insertFluid(extracted, extracted.amount, false);
+        if (remainder != null) {
+            storage.insertFluid(remainder, remainder.amount, false);
         }
     }
 
@@ -284,22 +284,22 @@ public class TileDiskManipulator extends TileNode implements IComparable, IFilte
             return;
         }
         FluidStack extracted = null;
-        int ii = 0;
+        int i = 0;
         if (IFilterable.isEmpty(itemFilters)) {
             FluidStack toExtract = null;
             ArrayList<FluidStack> networkFluids = new ArrayList<>(network.getFluidStorage().getStacks());
-            int iii = 0;
-            while ((toExtract == null || toExtract.amount == 0) && iii < networkFluids.size()) {
-                toExtract = networkFluids.get(iii++);
+            int j = 0;
+            while ((toExtract == null || toExtract.amount == 0) && j < networkFluids.size()) {
+                toExtract = networkFluids.get(j++);
             }
             if (toExtract != null) {
                 extracted = network.extractFluid(toExtract, 1, compare);
             }
         } else {
-            while (fluidFilters.getSlots() > ii && extracted == null) {
+            while (fluidFilters.getSlots() > i && extracted == null) {
                 FluidStack stack = null;
-                while (fluidFilters.getSlots() > ii && stack == null) {
-                    stack = fluidFilters.getFluidStackInSlot(ii++);
+                while (fluidFilters.getSlots() > i && stack == null) {
+                    stack = fluidFilters.getFluidStackInSlot(i++);
                 }
                 if (stack != null) {
                     extracted = network.extractFluid(stack, 1, compare);
@@ -311,9 +311,9 @@ public class TileDiskManipulator extends TileNode implements IComparable, IFilte
             moveDriveToOutput(slot);
             return;
         }
-        FluidStack leftOver = storage.insertFluid(extracted, extracted.amount, false);
-        if (leftOver != null) {
-            network.insertFluid(leftOver, leftOver.amount, false);
+        FluidStack remainder = storage.insertFluid(extracted, extracted.amount, false);
+        if (remainder != null) {
+            network.insertFluid(remainder, remainder.amount, false);
         }
     }
 
@@ -401,8 +401,8 @@ public class TileDiskManipulator extends TileNode implements IComparable, IFilte
             type = tag.getInteger(NBT_TYPE);
         }
 
-        if (tag.hasKey(NBT_IO_MOD)) {
-            ioMode = tag.getInteger(NBT_IO_MOD);
+        if (tag.hasKey(NBT_IO_MODE)) {
+            ioMode = tag.getInteger(NBT_IO_MODE);
         }
     }
 
@@ -417,7 +417,7 @@ public class TileDiskManipulator extends TileNode implements IComparable, IFilte
         tag.setInteger(NBT_COMPARE, compare);
         tag.setInteger(NBT_MODE, mode);
         tag.setInteger(NBT_TYPE, type);
-        tag.setInteger(NBT_IO_MOD, ioMode);
+        tag.setInteger(NBT_IO_MODE, ioMode);
 
         return tag;
     }
diff --git a/src/main/java/refinedstorage/tile/config/IFilterable.java b/src/main/java/refinedstorage/tile/config/IFilterable.java
index b6e6cff2c..8ca11e802 100755
--- a/src/main/java/refinedstorage/tile/config/IFilterable.java
+++ b/src/main/java/refinedstorage/tile/config/IFilterable.java
@@ -96,9 +96,11 @@ public interface IFilterable {
     }
 
     static boolean isEmpty(IItemHandler filter) {
-        for (int i = 0; i < filter.getSlots(); i++)
-            if (filter.getStackInSlot(i) != null)
+        for (int i = 0; i < filter.getSlots(); i++) {
+            if (filter.getStackInSlot(i) != null) {
                 return false;
+            }
+        }
         return true;
     }