diff --git a/src/main/java/com/raoulvdberge/refinedstorage/RSUtils.java b/src/main/java/com/raoulvdberge/refinedstorage/RSUtils.java
index d4ea1eeea..24e94a789 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/RSUtils.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/RSUtils.java
@@ -64,6 +64,7 @@ public final class RSUtils {
     private static final NonNullList EMPTY_NON_NULL_LIST = new NonNullList<Object>(Collections.emptyList(), null) {
     };
 
+    @SuppressWarnings("unchecked")
     public static <T> NonNullList<T> emptyNonNullList() {
         return (NonNullList<T>) EMPTY_NON_NULL_LIST;
     }
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/util/IStackList.java b/src/main/java/com/raoulvdberge/refinedstorage/api/util/IStackList.java
index 015af3c22..b7947941d 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/api/util/IStackList.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/api/util/IStackList.java
@@ -41,8 +41,8 @@ public interface IStackList<T> {
      * @param stack the stack
      * @return whether the remove was successful for the full amount
      */
-    default void remove(@Nonnull T stack) {
-        remove(stack, getSizeFromStack(stack));
+    default boolean remove(@Nonnull T stack) {
+        return remove(stack, getSizeFromStack(stack));
     }
 
     /**
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPattern.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPattern.java
index f6074e9ba..706f5bd77 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPattern.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPattern.java
@@ -31,7 +31,6 @@ public class CraftingPattern implements ICraftingPattern {
     private List<List<ItemStack>> oreInputs = new ArrayList<>();
     private List<ItemStack> outputs = new ArrayList<>();
     private List<ItemStack> byproducts = new ArrayList<>();
-    private boolean mekanism = false; // Cause they are special in so many ways ¯\_(ツ)_/¯
 
     public CraftingPattern(World world, ICraftingPatternContainer container, ItemStack stack) {
         this.container = container;
@@ -58,10 +57,11 @@ public class CraftingPattern implements ICraftingPattern {
             recipe = CraftingManager.getInstance().getRecipeList().stream().filter(r -> r.matches(inv, world)).findFirst().orElse(null);
             if (recipe != null) {
                 ItemStack output = recipe.getCraftingResult(inv);
-                if (output != null) {
+
+                if (!output.isEmpty()) {
                     boolean shapedOre = recipe instanceof ShapedOreRecipe;
                     // It is a dirty fix, but hey someone has to do it. ~ way2muchnoise 2016 "bite me"
-                    mekanism = recipe.getClass().getName().equals("mekanism.common.recipe.ShapedMekanismRecipe");
+                    boolean mekanism = recipe.getClass().getName().equals("mekanism.common.recipe.ShapedMekanismRecipe");
 
                     outputs.add(Comparer.stripTags(output.copy()));
 
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeDetector.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeDetector.java
index 5d431b3e1..35676d223 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeDetector.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeDetector.java
@@ -96,7 +96,7 @@ public class NetworkNodeDetector extends NetworkNode implements IComparable, ITy
                         powered = isPowered(stack == null ? null : stack.getCount());
                     }
                 } else {
-                    powered = mode == MODE_AUTOCRAFTING ? !network.getCraftingManager().getTasks().isEmpty() : isPowered(network.getItemStorageCache().getList().getStacks().stream().map(s -> s.getCount()).mapToInt(Number::intValue).sum());
+                    powered = mode == MODE_AUTOCRAFTING ? !network.getCraftingManager().getTasks().isEmpty() : isPowered(network.getItemStorageCache().getList().getStacks().stream().map(ItemStack::getCount).mapToInt(Number::intValue).sum());
                 }
             } else if (type == IType.FLUIDS) {
                 FluidStack slot = fluidFilters.getFluidStackInSlot(0);
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeDiskDrive.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeDiskDrive.java
index 3b58f0ff6..b04d218ac 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeDiskDrive.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeDiskDrive.java
@@ -30,6 +30,7 @@ import net.minecraftforge.items.IItemHandler;
 import net.minecraftforge.items.ItemHandlerHelper;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import java.util.List;
 
 public class NetworkNodeDiskDrive extends NetworkNode implements IStorageGui, IStorageProvider, IComparable, IFilterable, IPrioritizable, IType, IExcessVoidable, IAccessType {
@@ -50,6 +51,7 @@ public class NetworkNodeDiskDrive extends NetworkNode implements IStorageGui, IS
         }
 
         @Override
+        @Nullable
         public ItemStack insert(@Nonnull ItemStack stack, int size, boolean simulate) {
             if (!IFilterable.canTake(itemFilters, mode, getCompare(), stack)) {
                 return ItemHandlerHelper.copyStackWithSize(stack, size);
@@ -97,7 +99,8 @@ public class NetworkNodeDiskDrive extends NetworkNode implements IStorageGui, IS
         }
 
         @Override
-        public FluidStack insert(FluidStack stack, int size, boolean simulate) {
+        @Nullable
+        public FluidStack insert(@Nonnull FluidStack stack, int size, boolean simulate) {
             if (!IFilterable.canTakeFluids(fluidFilters, mode, getCompare(), stack)) {
                 return RSUtils.copyStackWithSize(stack, size);
             }
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeDiskManipulator.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeDiskManipulator.java
index 4af4b571d..60caac5a6 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeDiskManipulator.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeDiskManipulator.java
@@ -24,6 +24,7 @@ import net.minecraftforge.items.ItemHandlerHelper;
 import net.minecraftforge.items.wrapper.CombinedInvWrapper;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import java.util.ArrayList;
 
 public class NetworkNodeDiskManipulator extends NetworkNode implements IComparable, IFilterable, IType {
@@ -162,7 +163,8 @@ public class NetworkNodeDiskManipulator extends NetworkNode implements IComparab
         }
 
         @Override
-        public FluidStack insert(FluidStack stack, int size, boolean simulate) {
+        @Nullable
+        public FluidStack insert(@Nonnull FluidStack stack, int size, boolean simulate) {
             if (!IFilterable.canTakeFluids(fluidFilters, mode, getCompare(), stack)) {
                 return RSUtils.copyStackWithSize(stack, size);
             }
@@ -171,7 +173,8 @@ public class NetworkNodeDiskManipulator extends NetworkNode implements IComparab
         }
 
         @Override
-        public FluidStack extract(FluidStack stack, int size, int flags, boolean simulate) {
+        @Nullable
+        public FluidStack extract(@Nonnull FluidStack stack, int size, int flags, boolean simulate) {
             if (!IFilterable.canTakeFluids(fluidFilters, mode, getCompare(), stack)) {
                 return null;
             }
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeFluidStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeFluidStorage.java
index 842594e61..209d96fcc 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeFluidStorage.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeFluidStorage.java
@@ -22,6 +22,8 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.fluids.FluidStack;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import java.util.List;
 
 public class NetworkNodeFluidStorage extends NetworkNode implements IStorageGui, IStorageProvider, IComparable, IFilterable, IPrioritizable, IExcessVoidable, IAccessType {
@@ -38,7 +40,8 @@ public class NetworkNodeFluidStorage extends NetworkNode implements IStorageGui,
         }
 
         @Override
-        public FluidStack insert(FluidStack stack, int size, boolean simulate) {
+        @Nullable
+        public FluidStack insert(@Nonnull FluidStack stack, int size, boolean simulate) {
             if (!IFilterable.canTakeFluids(filters, mode, compare, stack)) {
                 return RSUtils.copyStackWithSize(stack, size);
             }
@@ -195,7 +198,7 @@ public class NetworkNodeFluidStorage extends NetworkNode implements IStorageGui,
 
     public EnumFluidStorageType getType() {
         if (type == null && holder.world().getBlockState(holder.pos()).getBlock() == RSBlocks.FLUID_STORAGE) {
-            type = ((EnumFluidStorageType) holder.world().getBlockState(holder.pos()).getValue(BlockFluidStorage.TYPE));
+            type = (EnumFluidStorageType) holder.world().getBlockState(holder.pos()).getValue(BlockFluidStorage.TYPE);
         }
 
         return type == null ? EnumFluidStorageType.TYPE_64K : type;
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeStorage.java
index e35e5f1c1..4e8129ba4 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeStorage.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeStorage.java
@@ -197,7 +197,7 @@ public class NetworkNodeStorage extends NetworkNode implements IStorageGui, ISto
 
     public EnumItemStorageType getType() {
         if (type == null && holder.world().getBlockState(holder.pos()).getBlock() == RSBlocks.STORAGE) {
-            type = ((EnumItemStorageType) holder.world().getBlockState(holder.pos()).getValue(BlockStorage.TYPE));
+            type = (EnumItemStorageType) holder.world().getBlockState(holder.pos()).getValue(BlockStorage.TYPE);
         }
 
         return type == null ? EnumItemStorageType.TYPE_1K : type;
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/externalstorage/StorageFluidExternal.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/externalstorage/StorageFluidExternal.java
index a1d2896f3..dcfe5b9dc 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/externalstorage/StorageFluidExternal.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/externalstorage/StorageFluidExternal.java
@@ -41,8 +41,8 @@ public class StorageFluidExternal implements IStorage<FluidStack> {
         return getContents() == null ? RSUtils.emptyNonNullList() : NonNullList.withSize(1, getContents().copy());
     }
 
-    @Nullable
     @Override
+    @Nullable
     public FluidStack insert(@Nonnull FluidStack stack, int size, boolean simulate) {
         if (getProperties() != null && IFilterable.canTakeFluids(externalStorage.getFluidFilters(), externalStorage.getMode(), externalStorage.getCompare(), stack) && getProperties().canFillFluidType(stack)) {
             int filled = handlerSupplier.get().fill(RSUtils.copyStackWithSize(stack, size), !simulate);
@@ -57,8 +57,8 @@ public class StorageFluidExternal implements IStorage<FluidStack> {
         return RSUtils.copyStackWithSize(stack, size);
     }
 
-    @Nullable
     @Override
+    @Nullable
     public FluidStack extract(@Nonnull FluidStack stack, int size, int flags, boolean simulate) {
         FluidStack toDrain = RSUtils.copyStackWithSize(stack, size);
 
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/readerwriter/ReaderWriterHandlerFluids.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/readerwriter/ReaderWriterHandlerFluids.java
index 14d9110cd..dbba2baf3 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/readerwriter/ReaderWriterHandlerFluids.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/readerwriter/ReaderWriterHandlerFluids.java
@@ -49,9 +49,9 @@ public class ReaderWriterHandlerFluids implements IReaderWriterHandler {
     public <T> T getCapability(IReaderWriter readerWriter, Capability<T> capability) {
         if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) {
             if (readerWriter instanceof IReader) {
-                return (T) tankReader;
+                return CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY.cast(tankReader);
             } else if (readerWriter instanceof IWriter) {
-                return (T) tankWriter;
+                return CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY.cast(tankWriter);
             }
         }
 
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/readerwriter/ReaderWriterHandlerItems.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/readerwriter/ReaderWriterHandlerItems.java
index bf24f74fa..3ef362640 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/readerwriter/ReaderWriterHandlerItems.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/readerwriter/ReaderWriterHandlerItems.java
@@ -51,9 +51,9 @@ public class ReaderWriterHandlerItems implements IReaderWriterHandler {
     public <T> T getCapability(IReaderWriter readerWriter, Capability<T> capability) {
         if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) {
             if (readerWriter instanceof IReader) {
-                return (T) itemsReader;
+                return CapabilityItemHandler.ITEM_HANDLER_CAPABILITY.cast(itemsReader);
             } else if (readerWriter instanceof IWriter) {
-                return (T) itemsWriter;
+                return CapabilityItemHandler.ITEM_HANDLER_CAPABILITY.cast(itemsWriter);
             }
         }
 
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageFluidNBT.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageFluidNBT.java
index d0f0fb2ea..5916e1a32 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageFluidNBT.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageFluidNBT.java
@@ -80,6 +80,7 @@ public abstract class StorageFluidNBT implements IStorage<FluidStack> {
     }
 
     @Override
+    @Nullable
     public synchronized FluidStack insert(@Nonnull FluidStack stack, int size, boolean simulate) {
         for (FluidStack otherStack : stacks) {
             if (otherStack.isFluidEqual(stack)) {
@@ -151,6 +152,7 @@ public abstract class StorageFluidNBT implements IStorage<FluidStack> {
     }
 
     @Override
+    @Nullable
     public synchronized FluidStack extract(@Nonnull FluidStack stack, int size, int flags, boolean simulate) {
         for (FluidStack otherStack : stacks) {
             if (API.instance().getComparer().isEqual(otherStack, stack, flags)) {
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageItemNBT.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageItemNBT.java
index 601def56c..fc0c97a97 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageItemNBT.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageItemNBT.java
@@ -117,6 +117,7 @@ public abstract class StorageItemNBT implements IStorage<ItemStack> {
     }
 
     @Override
+    @Nullable
     public synchronized ItemStack insert(@Nonnull ItemStack stack, int size, boolean simulate) {
         for (ItemStack otherStack : stacks) {
             if (API.instance().getComparer().isEqualNoQuantity(otherStack, stack)) {
@@ -188,6 +189,7 @@ public abstract class StorageItemNBT implements IStorage<ItemStack> {
     }
 
     @Override
+    @Nullable
     public synchronized ItemStack extract(@Nonnull ItemStack stack, int size, int flags, boolean simulate) {
         for (ItemStack otherStack : stacks) {
             if (API.instance().getComparer().isEqual(otherStack, stack, flags)) {
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/StackListFluid.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/StackListFluid.java
index 158f96254..fa93f59fc 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/StackListFluid.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/StackListFluid.java
@@ -18,7 +18,8 @@ public class StackListFluid implements IStackList<FluidStack> {
     private List<FluidStack> removeTracker = new LinkedList<>();
 
     @Override
-    public void add(FluidStack stack, int size) {
+    @Nullable
+    public void add(@Nonnull FluidStack stack, int size) {
         for (FluidStack otherStack : stacks.get(stack.getFluid())) {
             if (stack.isFluidEqual(otherStack)) {
                 otherStack.amount += size;
@@ -31,6 +32,7 @@ public class StackListFluid implements IStackList<FluidStack> {
     }
 
     @Override
+    @Nullable
     public boolean remove(@Nonnull FluidStack stack, int size) {
         for (FluidStack otherStack : stacks.get(stack.getFluid())) {
             if (stack.isFluidEqual(otherStack)) {
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCable.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCable.java
index 9a0685d09..5eef46193 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCable.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCable.java
@@ -64,11 +64,11 @@ public class BlockCable extends BlockNode {
         BlockStateContainer.Builder builder = super.createBlockStateBuilder();
 
         builder.add(NORTH)
-            .add(EAST)
-            .add(SOUTH)
-            .add(WEST)
-            .add(UP)
-            .add(DOWN);
+                .add(EAST)
+                .add(SOUTH)
+                .add(WEST)
+                .add(UP)
+                .add(DOWN);
 
         if (getPlacementType() != null) {
             builder.add(DIRECTION);
@@ -81,12 +81,12 @@ public class BlockCable extends BlockNode {
     @SuppressWarnings("deprecation")
     public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) {
         return super.getActualState(state, world, pos)
-            .withProperty(NORTH, hasConnectionWith(world, pos, EnumFacing.NORTH))
-            .withProperty(EAST, hasConnectionWith(world, pos, EnumFacing.EAST))
-            .withProperty(SOUTH, hasConnectionWith(world, pos, EnumFacing.SOUTH))
-            .withProperty(WEST, hasConnectionWith(world, pos, EnumFacing.WEST))
-            .withProperty(UP, hasConnectionWith(world, pos, EnumFacing.UP))
-            .withProperty(DOWN, hasConnectionWith(world, pos, EnumFacing.DOWN));
+                .withProperty(NORTH, hasConnectionWith(world, pos, EnumFacing.NORTH))
+                .withProperty(EAST, hasConnectionWith(world, pos, EnumFacing.EAST))
+                .withProperty(SOUTH, hasConnectionWith(world, pos, EnumFacing.SOUTH))
+                .withProperty(WEST, hasConnectionWith(world, pos, EnumFacing.WEST))
+                .withProperty(UP, hasConnectionWith(world, pos, EnumFacing.UP))
+                .withProperty(DOWN, hasConnectionWith(world, pos, EnumFacing.DOWN));
     }
 
     private boolean hasConnectionWith(IBlockAccess world, BlockPos pos, EnumFacing direction) {
@@ -104,12 +104,12 @@ public class BlockCable extends BlockNode {
         state = getActualState(state, world, pos);
 
         return isInAABB(CORE_AABB, hitX, hitY, hitZ) ||
-            (state.getValue(NORTH) && isInAABB(NORTH_AABB, hitX, hitY, hitZ)) ||
-            (state.getValue(EAST) && isInAABB(EAST_AABB, hitX, hitY, hitZ)) ||
-            (state.getValue(SOUTH) && isInAABB(SOUTH_AABB, hitX, hitY, hitZ)) ||
-            (state.getValue(WEST) && isInAABB(WEST_AABB, hitX, hitY, hitZ)) ||
-            (state.getValue(UP) && isInAABB(UP_AABB, hitX, hitY, hitZ)) ||
-            (state.getValue(DOWN) && isInAABB(DOWN_AABB, hitX, hitY, hitZ));
+                (state.getValue(NORTH) && isInAABB(NORTH_AABB, hitX, hitY, hitZ)) ||
+                (state.getValue(EAST) && isInAABB(EAST_AABB, hitX, hitY, hitZ)) ||
+                (state.getValue(SOUTH) && isInAABB(SOUTH_AABB, hitX, hitY, hitZ)) ||
+                (state.getValue(WEST) && isInAABB(WEST_AABB, hitX, hitY, hitZ)) ||
+                (state.getValue(UP) && isInAABB(UP_AABB, hitX, hitY, hitZ)) ||
+                (state.getValue(DOWN) && isInAABB(DOWN_AABB, hitX, hitY, hitZ));
     }
 
     public List<AxisAlignedBB> getUnionizedCollisionBoxes(IBlockState state) {
@@ -202,6 +202,7 @@ public class BlockCable extends BlockNode {
         return BlockRenderLayer.CUTOUT;
     }
 
+    @Override
     public EnumPlacementType getPlacementType() {
         return null;
     }
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockController.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockController.java
index 2e6dcbd79..97c3d5369 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockController.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockController.java
@@ -44,9 +44,9 @@ public class BlockController extends BlockBase {
     @Override
     protected BlockStateContainer createBlockState() {
         return createBlockStateBuilder()
-            .add(TYPE)
-            .add(ENERGY)
-            .build();
+                .add(TYPE)
+                .add(ENERGY)
+                .build();
     }
 
     @Override
@@ -62,7 +62,7 @@ public class BlockController extends BlockBase {
     @Override
     public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) {
         return super.getActualState(state, world, pos)
-            .withProperty(ENERGY, ((TileController) world.getTileEntity(pos)).getEnergyScaledForDisplay());
+                .withProperty(ENERGY, ((TileController) world.getTileEntity(pos)).getEnergyScaledForDisplay());
     }
 
     @Override
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDetector.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDetector.java
index 4443c7d34..40db2c76d 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDetector.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDetector.java
@@ -27,8 +27,8 @@ public class BlockDetector extends BlockNode {
     @Override
     protected BlockStateContainer createBlockState() {
         return createBlockStateBuilder()
-            .add(POWERED)
-            .build();
+                .add(POWERED)
+                .build();
     }
 
     @Override
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockFluidStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockFluidStorage.java
index 09075a278..92aad46ec 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockFluidStorage.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockFluidStorage.java
@@ -44,8 +44,8 @@ public class BlockFluidStorage extends BlockNode {
     @Override
     protected BlockStateContainer createBlockState() {
         return createBlockStateBuilder()
-            .add(TYPE)
-            .build();
+                .add(TYPE)
+                .build();
     }
 
     @Override
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockGrid.java
index 2f76c671b..39dceb282 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockGrid.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockGrid.java
@@ -1,7 +1,6 @@
 package com.raoulvdberge.refinedstorage.block;
 
 import com.raoulvdberge.refinedstorage.RSGui;
-import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNodeGrid;
 import com.raoulvdberge.refinedstorage.item.ItemBlockBase;
 import com.raoulvdberge.refinedstorage.tile.grid.TileGrid;
 import net.minecraft.block.properties.PropertyEnum;
@@ -40,8 +39,8 @@ public class BlockGrid extends BlockNode {
     @Override
     protected BlockStateContainer createBlockState() {
         return createBlockStateBuilder()
-            .add(TYPE)
-            .build();
+                .add(TYPE)
+                .build();
     }
 
     @Override
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockNode.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockNode.java
index 5ce73aad0..28f8dd103 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockNode.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockNode.java
@@ -1,7 +1,6 @@
 package com.raoulvdberge.refinedstorage.block;
 
 import com.raoulvdberge.refinedstorage.apiimpl.API;
-import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNode;
 import com.raoulvdberge.refinedstorage.tile.TileNode;
 import net.minecraft.block.properties.PropertyBool;
 import net.minecraft.block.state.BlockStateContainer;
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockSecurityManager.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockSecurityManager.java
index 70445c13b..f57392e13 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockSecurityManager.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockSecurityManager.java
@@ -3,7 +3,6 @@ package com.raoulvdberge.refinedstorage.block;
 import com.raoulvdberge.refinedstorage.RS;
 import com.raoulvdberge.refinedstorage.RSGui;
 import com.raoulvdberge.refinedstorage.api.network.security.Permission;
-import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNodeSecurityManager;
 import com.raoulvdberge.refinedstorage.tile.TileSecurityManager;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.EntityLivingBase;
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockSolderer.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockSolderer.java
index d5aac7908..7f74798fd 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockSolderer.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockSolderer.java
@@ -30,15 +30,15 @@ public class BlockSolderer extends BlockNode {
         super.addInformation(stack, player, tooltip, advanced);
 
         tooltip.add(I18n.format(
-            "block.refinedstorage:solderer.tooltip.0",
-            TextFormatting.WHITE + I18n.format("block.refinedstorage:controller.0.name") + TextFormatting.GRAY
+                "block.refinedstorage:solderer.tooltip.0",
+                TextFormatting.WHITE + I18n.format("block.refinedstorage:controller.0.name") + TextFormatting.GRAY
         ));
 
         tooltip.add(I18n.format("block.refinedstorage:solderer.tooltip.1"));
 
         tooltip.add(I18n.format(
-            "block.refinedstorage:solderer.tooltip.2",
-            TextFormatting.WHITE + I18n.format("block.refinedstorage:cable.name") + TextFormatting.GRAY
+                "block.refinedstorage:solderer.tooltip.2",
+                TextFormatting.WHITE + I18n.format("block.refinedstorage:cable.name") + TextFormatting.GRAY
         ));
     }
 
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockStorage.java
index cdd7899eb..6de3c7e83 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockStorage.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockStorage.java
@@ -44,8 +44,8 @@ public class BlockStorage extends BlockNode {
     @Override
     protected BlockStateContainer createBlockState() {
         return createBlockStateBuilder()
-            .add(TYPE)
-            .build();
+                .add(TYPE)
+                .build();
     }
 
     @Override
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/EnumPlacementType.java b/src/main/java/com/raoulvdberge/refinedstorage/block/EnumPlacementType.java
index 38d40f501..017239504 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/block/EnumPlacementType.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/block/EnumPlacementType.java
@@ -6,16 +6,16 @@ import net.minecraft.util.math.BlockPos;
 
 public enum EnumPlacementType {
     ANY(
-        EnumFacing.VALUES
+            EnumFacing.VALUES
     ),
     ANY_FACE_PLAYER(
-        EnumFacing.VALUES
+            EnumFacing.VALUES
     ),
     HORIZONTAL(
-        EnumFacing.NORTH,
-        EnumFacing.EAST,
-        EnumFacing.SOUTH,
-        EnumFacing.WEST
+            EnumFacing.NORTH,
+            EnumFacing.EAST,
+            EnumFacing.SOUTH,
+            EnumFacing.WEST
     );
 
     final EnumFacing[] allowed;
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerGridFilter.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerGridFilter.java
index 0e96981f4..da2156892 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerGridFilter.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerGridFilter.java
@@ -8,18 +8,18 @@ import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
 public class ContainerGridFilter extends ContainerBase {
-    private ItemHandlerGridFilter filter;
     private ItemStack stack;
 
     public ContainerGridFilter(EntityPlayer player, ItemStack stack) {
         super(null, player);
 
         this.stack = stack;
-        this.filter = new ItemHandlerGridFilter(stack);
 
         int y = 20;
         int x = 8;
 
+        ItemHandlerGridFilter filter = new ItemHandlerGridFilter(stack);
+
         for (int i = 0; i < 27; ++i) {
             addSlotToContainer(new SlotFilter(filter, i, x, y));
 
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiCraftingMonitor.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiCraftingMonitor.java
index dc2e70473..36daf14bd 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiCraftingMonitor.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiCraftingMonitor.java
@@ -97,10 +97,10 @@ public class GuiCraftingMonitor extends GuiBase {
         drawTexture(x, y, 0, 0, screenWidth, screenHeight);
 
         if (itemSelectedX != -1 &&
-            itemSelectedY != -1 &&
-            itemSelected >= 0 &&
-            itemSelected < getElements().size() &&
-            getElements().get(itemSelected).canDrawSelection()) {
+                itemSelectedY != -1 &&
+                itemSelected >= 0 &&
+                itemSelected < getElements().size() &&
+                getElements().get(itemSelected).canDrawSelection()) {
             drawTexture(x + itemSelectedX, y + itemSelectedY, 0, 232, ITEM_WIDTH, ITEM_HEIGHT);
         }
     }
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiNetworkTransmitter.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiNetworkTransmitter.java
index 46ecabc5b..f86614f93 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiNetworkTransmitter.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiNetworkTransmitter.java
@@ -1,6 +1,5 @@
 package com.raoulvdberge.refinedstorage.gui;
 
-import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNodeNetworkTransmitter;
 import com.raoulvdberge.refinedstorage.container.ContainerNetworkTransmitter;
 import com.raoulvdberge.refinedstorage.gui.sidebutton.SideButtonRedstoneMode;
 import com.raoulvdberge.refinedstorage.tile.TileNetworkTransmitter;
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiPriority.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiPriority.java
index b406ce9e5..07240ecb4 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiPriority.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiPriority.java
@@ -65,8 +65,8 @@ public class GuiPriority extends GuiCraftingStart {
     @Override
     protected int[] getIncrements() {
         return new int[]{
-            1, 5, 10,
-            -1, -5, -10
+                1, 5, 10,
+                -1, -5, -10
         };
     }
 
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiReaderWriter.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiReaderWriter.java
index 1829e282e..0c18f0e46 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiReaderWriter.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiReaderWriter.java
@@ -75,9 +75,9 @@ public class GuiReaderWriter extends GuiBase {
         drawTexture(x, y, 0, 0, screenWidth, screenHeight);
 
         if (itemSelectedX != -1 &&
-            itemSelectedY != -1 &&
-            itemSelected >= 0 &&
-            itemSelected < getChannels().size()) {
+                itemSelectedY != -1 &&
+                itemSelected >= 0 &&
+                itemSelected < getChannels().size()) {
             drawTexture(x + itemSelectedX, y + itemSelectedY, 0, 216, ITEM_WIDTH, ITEM_HEIGHT);
         }
 
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiStorage.java
index 62fa9a40c..271311ab9 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiStorage.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiStorage.java
@@ -84,8 +84,8 @@ public class GuiStorage extends GuiBase {
     public void drawForeground(int mouseX, int mouseY) {
         drawString(7, 7, t(gui.getGuiTitle()));
         drawString(7, 42, gui.getCapacity() == -1 ?
-            t("misc.refinedstorage:storage.stored_minimal", RSUtils.formatQuantity(gui.getStored())) :
-            t("misc.refinedstorage:storage.stored_capacity_minimal", RSUtils.formatQuantity(gui.getStored()), RSUtils.formatQuantity(gui.getCapacity()))
+                t("misc.refinedstorage:storage.stored_minimal", RSUtils.formatQuantity(gui.getStored())) :
+                t("misc.refinedstorage:storage.stored_capacity_minimal", RSUtils.formatQuantity(gui.getStored()), RSUtils.formatQuantity(gui.getCapacity()))
         );
 
         if (texture.contains("disk_drive")) { // HACK!
@@ -102,8 +102,8 @@ public class GuiStorage extends GuiBase {
             }
 
             drawTooltip(mouseX, mouseY, (gui.getCapacity() == -1 ?
-                t("misc.refinedstorage:storage.stored_minimal", gui.getStored()) :
-                t("misc.refinedstorage:storage.stored_capacity_minimal", gui.getStored(), gui.getCapacity())
+                    t("misc.refinedstorage:storage.stored_minimal", gui.getStored()) :
+                    t("misc.refinedstorage:storage.stored_capacity_minimal", gui.getStored(), gui.getCapacity())
             ) + "\n" + t("misc.refinedstorage:storage.full", full));
         }
     }
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GuiGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GuiGrid.java
index cc1b941fe..cd4f8074d 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GuiGrid.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GuiGrid.java
@@ -186,10 +186,10 @@ public class GuiGrid extends GuiBase implements IGridDisplay {
             SORTING_NAME.setSortingDirection(grid.getSortingDirection());
             SORTING_QUANTITY.setSortingDirection(grid.getSortingDirection());
 
-            Collections.sort(stacks, SORTING_NAME);
+            stacks.sort(SORTING_NAME);
 
             if (grid.getSortingType() == NetworkNodeGrid.SORTING_TYPE_QUANTITY) {
-                Collections.sort(stacks, SORTING_QUANTITY);
+                stacks.sort(SORTING_QUANTITY);
             }
         }
 
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/integration/forgeenergy/ReaderWriterHandlerForgeEnergy.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/forgeenergy/ReaderWriterHandlerForgeEnergy.java
index 4736f04b7..75d4b359e 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/integration/forgeenergy/ReaderWriterHandlerForgeEnergy.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/forgeenergy/ReaderWriterHandlerForgeEnergy.java
@@ -50,9 +50,9 @@ public class ReaderWriterHandlerForgeEnergy implements IReaderWriterHandler {
     public <T> T getCapability(IReaderWriter readerWriter, Capability<T> capability) {
         if (capability == CapabilityEnergy.ENERGY) {
             if (readerWriter instanceof IReader) {
-                return (T) storageReader;
+                return CapabilityEnergy.ENERGY.cast(storageReader);
             } else if (readerWriter instanceof IWriter) {
-                return (T) storageWriter;
+                return CapabilityEnergy.ENERGY.cast(storageWriter);
             }
         }
 
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/integration/tesla/ReaderWriterHandlerTesla.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/tesla/ReaderWriterHandlerTesla.java
index 23319b6ab..147ef6eab 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/integration/tesla/ReaderWriterHandlerTesla.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/tesla/ReaderWriterHandlerTesla.java
@@ -59,11 +59,11 @@ public class ReaderWriterHandlerTesla implements IReaderWriterHandler {
     public <T> T getCapability(IReaderWriter readerWriter, Capability<T> capability) {
         if (readerWriter instanceof IReader || readerWriter instanceof IWriter) {
             if (capability == TeslaCapabilities.CAPABILITY_HOLDER) {
-                return (T) container;
+                return TeslaCapabilities.CAPABILITY_HOLDER.cast(container);
             } else if (capability == TeslaCapabilities.CAPABILITY_CONSUMER && readerWriter instanceof IReader) {
-                return (T) containerReader;
+                return TeslaCapabilities.CAPABILITY_CONSUMER.cast(containerReader);
             } else if (capability == TeslaCapabilities.CAPABILITY_PRODUCER && readerWriter instanceof IWriter) {
-                return (T) containerWriter;
+                return TeslaCapabilities.CAPABILITY_PRODUCER.cast(containerWriter);
             }
         }
 
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemNetworkItem.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemNetworkItem.java
index 689c5f761..dc02e94f3 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemNetworkItem.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemNetworkItem.java
@@ -202,10 +202,10 @@ public abstract class ItemNetworkItem extends ItemBase implements INetworkItemPr
 
     public boolean isValid(ItemStack stack) {
         return stack.hasTagCompound()
-            && stack.getTagCompound().hasKey(NBT_CONTROLLER_X)
-            && stack.getTagCompound().hasKey(NBT_CONTROLLER_Y)
-            && stack.getTagCompound().hasKey(NBT_CONTROLLER_Z)
-            && stack.getTagCompound().hasKey(NBT_DIMENSION_ID);
+                && stack.getTagCompound().hasKey(NBT_CONTROLLER_X)
+                && stack.getTagCompound().hasKey(NBT_CONTROLLER_Y)
+                && stack.getTagCompound().hasKey(NBT_CONTROLLER_Z)
+                && stack.getTagCompound().hasKey(NBT_DIMENSION_ID);
     }
 
     private class NetworkItemCapabilityProvider implements ICapabilityProvider {
@@ -218,7 +218,7 @@ public abstract class ItemNetworkItem extends ItemBase implements INetworkItemPr
         @Override
         public boolean hasCapability(Capability<?> capability, @Nullable EnumFacing facing) {
             return capability == CapabilityEnergy.ENERGY ||
-                (IntegrationTesla.isLoaded() && (capability == TeslaCapabilities.CAPABILITY_HOLDER || capability == TeslaCapabilities.CAPABILITY_CONSUMER));
+                    (IntegrationTesla.isLoaded() && (capability == TeslaCapabilities.CAPABILITY_HOLDER || capability == TeslaCapabilities.CAPABILITY_CONSUMER));
         }
 
         @Override
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemWrench.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemWrench.java
index 2d579e38c..637e56fea 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemWrench.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemWrench.java
@@ -139,8 +139,8 @@ public class ItemWrench extends ItemBase {
             next.writeToNBT(stack.getTagCompound());
 
             player.sendMessage(new TextComponentTranslation(
-                "item.refinedstorage:wrench.mode",
-                new TextComponentTranslation("item.refinedstorage:wrench.mode." + next.id).setStyle(new Style().setColor(TextFormatting.YELLOW))
+                    "item.refinedstorage:wrench.mode",
+                    new TextComponentTranslation("item.refinedstorage:wrench.mode." + next.id).setStyle(new Style().setColor(TextFormatting.YELLOW))
             ));
         }
 
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridItemUpdate.java b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridItemUpdate.java
index 40ab3bca5..026db2647 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridItemUpdate.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridItemUpdate.java
@@ -14,6 +14,7 @@ import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 public class MessageGridItemUpdate implements IMessage, IMessageHandler<MessageGridItemUpdate, IMessage> {
     private INetworkMaster network;
@@ -46,7 +47,7 @@ public class MessageGridItemUpdate implements IMessage, IMessageHandler<MessageG
         int size = network.getItemStorageCache().getList().getStacks().size();
 
         for (ICraftingPattern pattern : network.getCraftingManager().getPatterns()) {
-            size += pattern.getOutputs().stream().filter(o -> o != null).count();
+            size += pattern.getOutputs().stream().filter(Objects::nonNull).count();
         }
 
         buf.writeInt(size);
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/proxy/CapabilityNetworkNodeProxy.java b/src/main/java/com/raoulvdberge/refinedstorage/proxy/CapabilityNetworkNodeProxy.java
index d9d7c714d..66878e895 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/proxy/CapabilityNetworkNodeProxy.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/proxy/CapabilityNetworkNodeProxy.java
@@ -1,5 +1,7 @@
 package com.raoulvdberge.refinedstorage.proxy;
 
+import javax.annotation.Nonnull;
+
 import com.google.common.base.Preconditions;
 import com.raoulvdberge.refinedstorage.api.network.INetworkNode;
 import com.raoulvdberge.refinedstorage.api.network.INetworkNodeProxy;
@@ -10,8 +12,6 @@ import net.minecraftforge.common.capabilities.Capability;
 import net.minecraftforge.common.capabilities.CapabilityInject;
 import net.minecraftforge.common.capabilities.CapabilityManager;
 
-import javax.annotation.Nonnull;
-
 public class CapabilityNetworkNodeProxy {
     @CapabilityInject(INetworkNodeProxy.class)
     public static Capability<INetworkNodeProxy> NETWORK_NODE_PROXY_CAPABILITY = null;
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyClient.java b/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyClient.java
index 192edbc96..8dac929be 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyClient.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyClient.java
@@ -55,58 +55,58 @@ public class ProxyClient extends ProxyCommon {
 
         // Item Variants
         ModelBakery.registerItemVariants(RSItems.STORAGE_DISK,
-            new ResourceLocation("refinedstorage:1k_storage_disk"),
-            new ResourceLocation("refinedstorage:4k_storage_disk"),
-            new ResourceLocation("refinedstorage:16k_storage_disk"),
-            new ResourceLocation("refinedstorage:64k_storage_disk"),
-            new ResourceLocation("refinedstorage:creative_storage_disk")
+                new ResourceLocation("refinedstorage:1k_storage_disk"),
+                new ResourceLocation("refinedstorage:4k_storage_disk"),
+                new ResourceLocation("refinedstorage:16k_storage_disk"),
+                new ResourceLocation("refinedstorage:64k_storage_disk"),
+                new ResourceLocation("refinedstorage:creative_storage_disk")
         );
 
         ModelBakery.registerItemVariants(RSItems.STORAGE_PART,
-            new ResourceLocation("refinedstorage:1k_storage_part"),
-            new ResourceLocation("refinedstorage:4k_storage_part"),
-            new ResourceLocation("refinedstorage:16k_storage_part"),
-            new ResourceLocation("refinedstorage:64k_storage_part")
+                new ResourceLocation("refinedstorage:1k_storage_part"),
+                new ResourceLocation("refinedstorage:4k_storage_part"),
+                new ResourceLocation("refinedstorage:16k_storage_part"),
+                new ResourceLocation("refinedstorage:64k_storage_part")
         );
 
         ModelBakery.registerItemVariants(RSItems.FLUID_STORAGE_DISK,
-            new ResourceLocation("refinedstorage:64k_fluid_storage_disk"),
-            new ResourceLocation("refinedstorage:128k_fluid_storage_disk"),
-            new ResourceLocation("refinedstorage:256k_fluid_storage_disk"),
-            new ResourceLocation("refinedstorage:512k_fluid_storage_disk"),
-            new ResourceLocation("refinedstorage:creative_fluid_storage_disk")
+                new ResourceLocation("refinedstorage:64k_fluid_storage_disk"),
+                new ResourceLocation("refinedstorage:128k_fluid_storage_disk"),
+                new ResourceLocation("refinedstorage:256k_fluid_storage_disk"),
+                new ResourceLocation("refinedstorage:512k_fluid_storage_disk"),
+                new ResourceLocation("refinedstorage:creative_fluid_storage_disk")
         );
 
         ModelBakery.registerItemVariants(RSItems.FLUID_STORAGE_PART,
-            new ResourceLocation("refinedstorage:64k_fluid_storage_part"),
-            new ResourceLocation("refinedstorage:128k_fluid_storage_part"),
-            new ResourceLocation("refinedstorage:256k_fluid_storage_part"),
-            new ResourceLocation("refinedstorage:512k_fluid_storage_part")
+                new ResourceLocation("refinedstorage:64k_fluid_storage_part"),
+                new ResourceLocation("refinedstorage:128k_fluid_storage_part"),
+                new ResourceLocation("refinedstorage:256k_fluid_storage_part"),
+                new ResourceLocation("refinedstorage:512k_fluid_storage_part")
         );
 
         ModelBakery.registerItemVariants(RSItems.PROCESSOR,
-            new ResourceLocation("refinedstorage:basic_printed_processor"),
-            new ResourceLocation("refinedstorage:improved_printed_processor"),
-            new ResourceLocation("refinedstorage:advanced_printed_processor"),
-            new ResourceLocation("refinedstorage:basic_processor"),
-            new ResourceLocation("refinedstorage:improved_processor"),
-            new ResourceLocation("refinedstorage:advanced_processor"),
-            new ResourceLocation("refinedstorage:printed_silicon")
+                new ResourceLocation("refinedstorage:basic_printed_processor"),
+                new ResourceLocation("refinedstorage:improved_printed_processor"),
+                new ResourceLocation("refinedstorage:advanced_printed_processor"),
+                new ResourceLocation("refinedstorage:basic_processor"),
+                new ResourceLocation("refinedstorage:improved_processor"),
+                new ResourceLocation("refinedstorage:advanced_processor"),
+                new ResourceLocation("refinedstorage:printed_silicon")
         );
 
         ModelBakery.registerItemVariants(RSItems.CORE,
-            new ResourceLocation("refinedstorage:construction_core"),
-            new ResourceLocation("refinedstorage:destruction_core")
+                new ResourceLocation("refinedstorage:construction_core"),
+                new ResourceLocation("refinedstorage:destruction_core")
         );
 
         ModelBakery.registerItemVariants(RSItems.UPGRADE,
-            new ResourceLocation("refinedstorage:upgrade"),
-            new ResourceLocation("refinedstorage:range_upgrade"),
-            new ResourceLocation("refinedstorage:speed_upgrade"),
-            new ResourceLocation("refinedstorage:stack_upgrade"),
-            new ResourceLocation("refinedstorage:interdimensional_upgrade"),
-            new ResourceLocation("refinedstorage:silk_touch_upgrade"),
-            new ResourceLocation("refinedstorage:fortune_upgrade")
+                new ResourceLocation("refinedstorage:upgrade"),
+                new ResourceLocation("refinedstorage:range_upgrade"),
+                new ResourceLocation("refinedstorage:speed_upgrade"),
+                new ResourceLocation("refinedstorage:stack_upgrade"),
+                new ResourceLocation("refinedstorage:interdimensional_upgrade"),
+                new ResourceLocation("refinedstorage:silk_touch_upgrade"),
+                new ResourceLocation("refinedstorage:fortune_upgrade")
         );
 
         // Items
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileConstructor.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileConstructor.java
index df8865d8d..ef73708bd 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileConstructor.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileConstructor.java
@@ -1,6 +1,5 @@
 package com.raoulvdberge.refinedstorage.tile;
 
-import com.raoulvdberge.refinedstorage.api.network.INetworkNode;
 import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNodeConstructor;
 import com.raoulvdberge.refinedstorage.tile.config.IComparable;
 import com.raoulvdberge.refinedstorage.tile.config.IType;
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileController.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileController.java
index 36196b6f5..f6a1eae3b 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileController.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileController.java
@@ -121,7 +121,7 @@ public class TileController extends TileBase implements INetworkMaster, IRedston
                 }
             }
 
-            Collections.sort(nodes, CLIENT_NODE_COMPARATOR);
+            nodes.sort(CLIENT_NODE_COMPARATOR);
 
             return nodes;
         }
@@ -221,8 +221,8 @@ public class TileController extends TileBase implements INetworkMaster, IRedston
     public void update() {
         if (!getWorld().isRemote) {
             if (canRun()) {
-                Collections.sort(itemStorage.getStorages(), STORAGE_COMPARATOR);
-                Collections.sort(fluidStorage.getStorages(), STORAGE_COMPARATOR);
+                itemStorage.getStorages().sort(STORAGE_COMPARATOR);
+                fluidStorage.getStorages().sort(STORAGE_COMPARATOR);
 
                 craftingManager.update();
 
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileExporter.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileExporter.java
index 0667dfc3e..6cb0d6dd8 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileExporter.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileExporter.java
@@ -56,7 +56,7 @@ public class TileExporter extends TileNode<NetworkNodeExporter> {
         }
     });
 
-    public static final TileDataParameter<Boolean> CRAFT_ONLY = new TileDataParameter<Boolean>(DataSerializers.BOOLEAN, false, new ITileDataProducer<Boolean, TileExporter>() {
+    public static final TileDataParameter<Boolean> CRAFT_ONLY = new TileDataParameter<>(DataSerializers.BOOLEAN, false, new ITileDataProducer<Boolean, TileExporter>() {
         @Override
         public Boolean getValue(TileExporter tile) {
             return tile.getNode().isCraftOnly();
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileInterface.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileInterface.java
index 9272266ca..9f629cbb3 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileInterface.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileInterface.java
@@ -1,6 +1,5 @@
 package com.raoulvdberge.refinedstorage.tile;
 
-import com.raoulvdberge.refinedstorage.api.network.INetworkNode;
 import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNodeInterface;
 import com.raoulvdberge.refinedstorage.tile.config.IComparable;
 import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter;
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileNetworkTransmitter.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileNetworkTransmitter.java
index 7639f2dbf..ac9492279 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileNetworkTransmitter.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileNetworkTransmitter.java
@@ -1,6 +1,5 @@
 package com.raoulvdberge.refinedstorage.tile;
 
-import com.raoulvdberge.refinedstorage.api.network.INetworkNode;
 import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNodeNetworkTransmitter;
 import com.raoulvdberge.refinedstorage.tile.data.ITileDataProducer;
 import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter;
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileNode.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileNode.java
index 015336214..6acaf7ae3 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileNode.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileNode.java
@@ -20,7 +20,7 @@ import net.minecraftforge.items.IItemHandler;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-public abstract class TileNode<T extends NetworkNode> extends TileBase implements INetworkNodeProxy<T>, INetworkNodeHolder, IRedstoneConfigurable {
+public abstract class TileNode<N extends NetworkNode> extends TileBase implements INetworkNodeProxy<N>, INetworkNodeHolder, IRedstoneConfigurable {
     public static final TileDataParameter<Integer> REDSTONE_MODE = RedstoneMode.createParameter();
 
     private NBTTagCompound legacyTagToRead;
@@ -121,7 +121,7 @@ public abstract class TileNode<T extends NetworkNode> extends TileBase implement
     @Override
     @Nonnull
     @SuppressWarnings("unchecked")
-    public T getNode() {
+    public N getNode() {
         INetworkNodeProvider provider = API.instance().getNetworkNodeProvider(getWorld().provider.getDimension());
 
         INetworkNode node = provider.getNode(pos);
@@ -130,10 +130,10 @@ public abstract class TileNode<T extends NetworkNode> extends TileBase implement
             provider.setNode(pos, node = createNode());
         }
 
-        return (T) node;
+        return (N) node;
     }
 
-    public abstract T createNode();
+    public abstract N createNode();
 
     @Override
     public boolean hasCapability(Capability<?> capability, @Nullable EnumFacing side) {
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileStorage.java
index cddbbc53d..8db72b75c 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileStorage.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileStorage.java
@@ -1,6 +1,5 @@
 package com.raoulvdberge.refinedstorage.tile;
 
-import com.raoulvdberge.refinedstorage.api.network.INetworkNode;
 import com.raoulvdberge.refinedstorage.api.storage.AccessType;
 import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNodeStorage;
 import com.raoulvdberge.refinedstorage.apiimpl.storage.StorageItemNBT;
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileWirelessTransmitter.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileWirelessTransmitter.java
index 31da69670..0b284d418 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileWirelessTransmitter.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileWirelessTransmitter.java
@@ -1,6 +1,5 @@
 package com.raoulvdberge.refinedstorage.tile;
 
-import com.raoulvdberge.refinedstorage.api.network.INetworkNode;
 import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNodeWirelessTransmitter;
 import com.raoulvdberge.refinedstorage.tile.data.ITileDataProducer;
 import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter;
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileWriter.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileWriter.java
index a8c5338bd..88e099844 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileWriter.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileWriter.java
@@ -1,6 +1,5 @@
 package com.raoulvdberge.refinedstorage.tile;
 
-import com.raoulvdberge.refinedstorage.api.network.INetworkNode;
 import com.raoulvdberge.refinedstorage.api.network.readerwriter.IReaderWriterChannel;
 import com.raoulvdberge.refinedstorage.api.network.readerwriter.IReaderWriterHandler;
 import com.raoulvdberge.refinedstorage.api.network.readerwriter.IWriter;