diff --git a/src/main/java/refinedstorage/block/BlockBase.java b/src/main/java/refinedstorage/block/BlockBase.java
index 84708da07..ffd34a258 100755
--- a/src/main/java/refinedstorage/block/BlockBase.java
+++ b/src/main/java/refinedstorage/block/BlockBase.java
@@ -21,7 +21,7 @@ import refinedstorage.item.ItemBlockBase;
 import refinedstorage.tile.TileBase;
 
 public abstract class BlockBase extends Block {
-    public static final PropertyDirection DIRECTION = PropertyDirection.create("direction");
+    private static final PropertyDirection DIRECTION = PropertyDirection.create("direction");
 
     private String name;
 
@@ -147,7 +147,7 @@ public abstract class BlockBase extends Block {
         world.setBlockToAir(pos);
     }
 
-    public EnumPlacementType getPlacementType() {
+    protected EnumPlacementType getPlacementType() {
         return EnumPlacementType.HORIZONTAL;
     }
 }
diff --git a/src/main/java/refinedstorage/block/BlockCable.java b/src/main/java/refinedstorage/block/BlockCable.java
index e301b8b24..be63c1310 100755
--- a/src/main/java/refinedstorage/block/BlockCable.java
+++ b/src/main/java/refinedstorage/block/BlockCable.java
@@ -16,12 +16,12 @@ import refinedstorage.tile.TileCable;
 public class BlockCable extends BlockNode {
     private static final AxisAlignedBB CABLE_AABB = new AxisAlignedBB(4 * (1F / 16F), 4 * (1F / 16F), 4 * (1F / 16F), 1 - 4 * (1F / 16F), 1 - 4 * (1F / 16F), 1 - 4 * (1F / 16F));
 
-    public static final PropertyBool NORTH = PropertyBool.create("north");
-    public static final PropertyBool EAST = PropertyBool.create("east");
-    public static final PropertyBool SOUTH = PropertyBool.create("south");
-    public static final PropertyBool WEST = PropertyBool.create("west");
-    public static final PropertyBool UP = PropertyBool.create("up");
-    public static final PropertyBool DOWN = PropertyBool.create("down");
+    private static final PropertyBool NORTH = PropertyBool.create("north");
+    private static final PropertyBool EAST = PropertyBool.create("east");
+    private static final PropertyBool SOUTH = PropertyBool.create("south");
+    private static final PropertyBool WEST = PropertyBool.create("west");
+    private static final PropertyBool UP = PropertyBool.create("up");
+    private static final PropertyBool DOWN = PropertyBool.create("down");
 
     public BlockCable(String name) {
         super(name);
@@ -91,7 +91,7 @@ public class BlockCable extends BlockNode {
     }
 
     @Override
-    public EnumPlacementType getPlacementType() {
+    protected EnumPlacementType getPlacementType() {
         return null;
     }
 }
diff --git a/src/main/java/refinedstorage/block/BlockController.java b/src/main/java/refinedstorage/block/BlockController.java
index 549f59587..ec991271c 100755
--- a/src/main/java/refinedstorage/block/BlockController.java
+++ b/src/main/java/refinedstorage/block/BlockController.java
@@ -29,7 +29,8 @@ import java.util.List;
 
 public class BlockController extends BlockBase {
     public static final PropertyEnum TYPE = PropertyEnum.create("type", EnumControllerType.class);
-    public static final PropertyInteger ENERGY = PropertyInteger.create("energy", 0, 7);
+
+    private static final PropertyInteger ENERGY = PropertyInteger.create("energy", 0, 7);
 
     public BlockController() {
         super("controller");
diff --git a/src/main/java/refinedstorage/block/BlockDetector.java b/src/main/java/refinedstorage/block/BlockDetector.java
index c29c2f6e4..2b40487d9 100755
--- a/src/main/java/refinedstorage/block/BlockDetector.java
+++ b/src/main/java/refinedstorage/block/BlockDetector.java
@@ -18,9 +18,9 @@ import refinedstorage.RefinedStorageGui;
 import refinedstorage.tile.TileDetector;
 
 public class BlockDetector extends BlockNode {
-    public static final AxisAlignedBB AABB_DETECTOR = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 4D / 16D, 1.0D);
+    private static final AxisAlignedBB AABB_DETECTOR = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 4D / 16D, 1.0D);
 
-    public static final PropertyBool POWERED = PropertyBool.create("powered");
+    private static final PropertyBool POWERED = PropertyBool.create("powered");
 
     public BlockDetector() {
         super("detector");
diff --git a/src/main/java/refinedstorage/block/BlockDiskDrive.java b/src/main/java/refinedstorage/block/BlockDiskDrive.java
index 048beb1d4..35aa8c510 100755
--- a/src/main/java/refinedstorage/block/BlockDiskDrive.java
+++ b/src/main/java/refinedstorage/block/BlockDiskDrive.java
@@ -16,7 +16,7 @@ import refinedstorage.RefinedStorageGui;
 import refinedstorage.tile.TileDiskDrive;
 
 public class BlockDiskDrive extends BlockNode {
-    public static final PropertyInteger STORED = PropertyInteger.create("stored", 0, 7);
+    private static final PropertyInteger STORED = PropertyInteger.create("stored", 0, 7);
 
     public BlockDiskDrive() {
         super("disk_drive");
diff --git a/src/main/java/refinedstorage/block/BlockNode.java b/src/main/java/refinedstorage/block/BlockNode.java
index 8156606eb..896f2cb65 100755
--- a/src/main/java/refinedstorage/block/BlockNode.java
+++ b/src/main/java/refinedstorage/block/BlockNode.java
@@ -15,7 +15,7 @@ import refinedstorage.api.network.NetworkUtils;
 import refinedstorage.tile.TileNode;
 
 public abstract class BlockNode extends BlockBase {
-    public static final PropertyBool CONNECTED = PropertyBool.create("connected");
+    private static final PropertyBool CONNECTED = PropertyBool.create("connected");
 
     public BlockNode(String name) {
         super(name);
diff --git a/src/main/java/refinedstorage/block/BlockSolderer.java b/src/main/java/refinedstorage/block/BlockSolderer.java
index b3f81f07a..a1508e167 100755
--- a/src/main/java/refinedstorage/block/BlockSolderer.java
+++ b/src/main/java/refinedstorage/block/BlockSolderer.java
@@ -17,9 +17,9 @@ import refinedstorage.RefinedStorageGui;
 import refinedstorage.tile.TileSolderer;
 
 public class BlockSolderer extends BlockNode {
-    public static final AxisAlignedBB AABB_SOLDERER = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 14D / 16D, 1.0D);
+    private static final AxisAlignedBB AABB_SOLDERER = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 14D / 16D, 1.0D);
 
-    public static final PropertyBool WORKING = PropertyBool.create("working");
+    private static final PropertyBool WORKING = PropertyBool.create("working");
 
     public BlockSolderer() {
         super("solderer");
diff --git a/src/main/java/refinedstorage/block/EnumPlacementType.java b/src/main/java/refinedstorage/block/EnumPlacementType.java
index b95a51f47..34945559a 100755
--- a/src/main/java/refinedstorage/block/EnumPlacementType.java
+++ b/src/main/java/refinedstorage/block/EnumPlacementType.java
@@ -14,7 +14,7 @@ public enum EnumPlacementType {
         EnumFacing.WEST
     );
 
-    public final EnumFacing[] allowed;
+    final EnumFacing[] allowed;
 
     EnumPlacementType(EnumFacing... allowed) {
         this.allowed = allowed;
diff --git a/src/main/java/refinedstorage/container/ContainerBase.java b/src/main/java/refinedstorage/container/ContainerBase.java
index c7ef765b3..896b211e5 100755
--- a/src/main/java/refinedstorage/container/ContainerBase.java
+++ b/src/main/java/refinedstorage/container/ContainerBase.java
@@ -107,7 +107,7 @@ public abstract class ContainerBase extends Container {
         return null;
     }
 
-    public ItemStack mergeItemStackToSpecimen(ItemStack stack, int begin, int end) {
+    protected ItemStack mergeItemStackToSpecimen(ItemStack stack, int begin, int end) {
         for (int i = begin; i < end; ++i) {
             if (CompareUtils.compareStackNoQuantity(getSlot(i).getStack(), stack)) {
                 return null;
diff --git a/src/main/java/refinedstorage/container/ContainerDummy.java b/src/main/java/refinedstorage/container/ContainerDummy.java
deleted file mode 100755
index c9022f70b..000000000
--- a/src/main/java/refinedstorage/container/ContainerDummy.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package refinedstorage.container;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.Container;
-
-public class ContainerDummy extends Container {
-    @Override
-    public boolean canInteractWith(EntityPlayer player) {
-        return false;
-    }
-}
diff --git a/src/main/java/refinedstorage/gui/GuiBase.java b/src/main/java/refinedstorage/gui/GuiBase.java
index 17824d823..9e99022a8 100755
--- a/src/main/java/refinedstorage/gui/GuiBase.java
+++ b/src/main/java/refinedstorage/gui/GuiBase.java
@@ -136,7 +136,7 @@ public abstract class GuiBase extends GuiContainer {
     protected void actionPerformed(GuiButton button) throws IOException {
         super.actionPerformed(button);
 
-        sideButtons.stream().filter(b -> b.getId() == button.id).findFirst().ifPresent(s -> s.actionPerformed());
+        sideButtons.stream().filter(b -> b.getId() == button.id).findFirst().ifPresent(SideButton::actionPerformed);
     }
 
     public GuiButton addButton(int x, int y, int w, int h) {
diff --git a/src/main/java/refinedstorage/gui/GuiController.java b/src/main/java/refinedstorage/gui/GuiController.java
index dd5b21000..5f3f323b7 100755
--- a/src/main/java/refinedstorage/gui/GuiController.java
+++ b/src/main/java/refinedstorage/gui/GuiController.java
@@ -104,7 +104,7 @@ public class GuiController extends GuiBase {
         }
     }
 
-    public int getOffset() {
+    private int getOffset() {
         return (int) Math.ceil(getScrollbar().getCurrentScroll() / 59f * (float) getRows());
     }
 
diff --git a/src/main/java/refinedstorage/gui/GuiCraftingMonitor.java b/src/main/java/refinedstorage/gui/GuiCraftingMonitor.java
index e17c49717..1ee5c86a0 100755
--- a/src/main/java/refinedstorage/gui/GuiCraftingMonitor.java
+++ b/src/main/java/refinedstorage/gui/GuiCraftingMonitor.java
@@ -146,7 +146,7 @@ public class GuiCraftingMonitor extends GuiBase {
         }
     }
 
-    public int getOffset() {
+    private int getOffset() {
         return (int) Math.ceil(getScrollbar().getCurrentScroll() / 89f * (float) getRows());
     }
 
diff --git a/src/main/java/refinedstorage/tile/TileController.java b/src/main/java/refinedstorage/tile/TileController.java
index 4f59b92b8..2c92ce535 100755
--- a/src/main/java/refinedstorage/tile/TileController.java
+++ b/src/main/java/refinedstorage/tile/TileController.java
@@ -391,9 +391,9 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR
 
     @Override
     public void sendStorageToClient() {
-        worldObj.getMinecraftServer().getPlayerList().getPlayerList().stream().filter(player -> isWatchingGrid(player)).forEach(player -> {
-            sendStorageToClient(player);
-        });
+        worldObj.getMinecraftServer().getPlayerList().getPlayerList().stream()
+            .filter(this::isWatchingGrid)
+            .forEach(this::sendStorageToClient);
     }
 
     @Override
@@ -403,9 +403,9 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR
 
     @Override
     public void sendStorageDeltaToClient(ItemStack stack, int delta) {
-        worldObj.getMinecraftServer().getPlayerList().getPlayerList().stream().filter(player -> isWatchingGrid(player)).forEach(player -> {
-            RefinedStorage.INSTANCE.network.sendTo(new MessageGridDelta(this, stack, delta), player);
-        });
+        worldObj.getMinecraftServer().getPlayerList().getPlayerList().stream()
+            .filter(this::isWatchingGrid)
+            .forEach(player -> RefinedStorage.INSTANCE.network.sendTo(new MessageGridDelta(this, stack, delta), player));
     }
 
     private boolean isWatchingGrid(EntityPlayer player) {
diff --git a/src/main/java/refinedstorage/tile/externalstorage/DrawerStorage.java b/src/main/java/refinedstorage/tile/externalstorage/DrawerStorage.java
index 6572a4681..9a4127daa 100755
--- a/src/main/java/refinedstorage/tile/externalstorage/DrawerStorage.java
+++ b/src/main/java/refinedstorage/tile/externalstorage/DrawerStorage.java
@@ -33,7 +33,7 @@ public class DrawerStorage extends ExternalStorage {
         return Collections.emptyList();
     }
 
-    public boolean isVoidable() {
+    private boolean isVoidable() {
         return drawer instanceof IVoidable && ((IVoidable) drawer).isVoid();
     }
 
diff --git a/src/main/java/refinedstorage/tile/externalstorage/TileExternalStorage.java b/src/main/java/refinedstorage/tile/externalstorage/TileExternalStorage.java
index 78c7a073e..f7ec81146 100755
--- a/src/main/java/refinedstorage/tile/externalstorage/TileExternalStorage.java
+++ b/src/main/java/refinedstorage/tile/externalstorage/TileExternalStorage.java
@@ -25,18 +25,18 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class TileExternalStorage extends TileNode implements IStorageProvider, IStorageGui, IComparable, IFilterable, IPrioritizable {
-    public static final TileDataParameter PRIORITY = IPrioritizable.createParameter();
-    public static final TileDataParameter COMPARE = IComparable.createParameter();
-    public static final TileDataParameter MODE = IFilterable.createParameter();
+    public static final TileDataParameter<Integer> PRIORITY = IPrioritizable.createParameter();
+    public static final TileDataParameter<Integer> COMPARE = IComparable.createParameter();
+    public static final TileDataParameter<Integer> MODE = IFilterable.createParameter();
 
-    public static final TileDataParameter STORED = TileDataManager.createParameter(DataSerializers.VARINT, new ITileDataProducer<Integer, TileExternalStorage>() {
+    public static final TileDataParameter<Integer> STORED = TileDataManager.createParameter(DataSerializers.VARINT, new ITileDataProducer<Integer, TileExternalStorage>() {
         @Override
         public Integer getValue(TileExternalStorage tile) {
             return tile.getStored();
         }
     });
 
-    public static final TileDataParameter CAPACITY = TileDataManager.createParameter(DataSerializers.VARINT, new ITileDataProducer<Integer, TileExternalStorage>() {
+    public static final TileDataParameter<Integer> CAPACITY = TileDataManager.createParameter(DataSerializers.VARINT, new ITileDataProducer<Integer, TileExternalStorage>() {
         @Override
         public Integer getValue(TileExternalStorage tile) {
             return tile.getCapacity();