diff --git a/src/main/java/refinedstorage/block/BlockCable.java b/src/main/java/refinedstorage/block/BlockCable.java
index bedd42bf5..82dd64ecb 100755
--- a/src/main/java/refinedstorage/block/BlockCable.java
+++ b/src/main/java/refinedstorage/block/BlockCable.java
@@ -74,6 +74,7 @@ public class BlockCable extends BlockCoverable {
         return new TileCable();
     }
 
+    @Override
     protected BlockStateContainer createBlockState() {
         BlockStateContainer.Builder builder = new BlockStateContainer.Builder(this);
 
@@ -113,7 +114,7 @@ public class BlockCable extends BlockCoverable {
         TileEntity facing = world.getTileEntity(pos.offset(direction));
 
         if (facing instanceof INetworkMaster || facing instanceof INetworkNode) {
-            // Do not render a cable extension where our cable "head" is (e.g. importer, exporter, external storage cubes).
+            // Do not render a cable extension where our cable "head" is (e.g. importer, exporter, external storage heads).
             if (getPlacementType() != null) {
                 return ((TileMultipartNode) world.getTileEntity(pos)).getFacingTile() != facing;
             }
diff --git a/src/main/java/refinedstorage/proxy/ClientProxy.java b/src/main/java/refinedstorage/proxy/ClientProxy.java
index e2db9c271..82a9439be 100755
--- a/src/main/java/refinedstorage/proxy/ClientProxy.java
+++ b/src/main/java/refinedstorage/proxy/ClientProxy.java
@@ -1,12 +1,10 @@
 package refinedstorage.proxy;
 
-import com.google.common.base.Predicate;
 import mcmultipart.client.multipart.ModelMultipartContainer;
 import net.minecraft.client.renderer.block.model.ModelBakery;
 import net.minecraft.client.renderer.block.model.ModelResourceLocation;
 import net.minecraft.client.renderer.block.statemap.StateMap;
 import net.minecraft.item.Item;
-import net.minecraft.util.BlockRenderLayer;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.client.event.ModelBakeEvent;
 import net.minecraftforge.client.model.ModelLoader;
@@ -22,21 +20,13 @@ import refinedstorage.block.EnumGridType;
 import refinedstorage.block.EnumStorageType;
 import refinedstorage.item.*;
 
-import javax.annotation.Nullable;
-
 public class ClientProxy extends CommonProxy {
     @SubscribeEvent
     public void onModelBake(ModelBakeEvent e) {
-        System.out.println("Model bake event called.");
         for (ModelResourceLocation model : e.getModelRegistry().getKeys()) {
             for (BlockCable cable : cables) {
                 if (model.getResourceDomain().equals(RefinedStorage.ID) && model.getResourcePath().equals(cable.getName()) && !model.getVariant().equals("inventory")) {
-                    e.getModelRegistry().putObject(model, new ModelMultipartContainer(e.getModelRegistry().getObject(model), new Predicate<BlockRenderLayer>() {
-                        @Override
-                        public boolean apply(@Nullable BlockRenderLayer input) {
-                            return cable.canRenderInLayer(input);
-                        }
-                    }));
+                    e.getModelRegistry().putObject(model, new ModelMultipartContainer(e.getModelRegistry().getObject(model), input -> cable.canRenderInLayer(input)));
                 }
             }
         }
diff --git a/src/main/java/refinedstorage/tile/TileMultipartNode.java b/src/main/java/refinedstorage/tile/TileMultipartNode.java
index 2c997664b..993222560 100755
--- a/src/main/java/refinedstorage/tile/TileMultipartNode.java
+++ b/src/main/java/refinedstorage/tile/TileMultipartNode.java
@@ -36,6 +36,7 @@ public abstract class TileMultipartNode extends TileNode implements IMicroblockC
     public MicroblockContainer getMicroblockContainer() {
         if (container == null) {
             container = new MicroblockContainer(this);
+
             container.getPartContainer().setListener(new IMultipartContainer.IMultipartContainerListener() {
                 @Override
                 public void onAddPartPre(IMultipart part) {