diff --git a/src/main/java/storagecraft/container/ContainerBase.java b/src/main/java/storagecraft/container/ContainerBase.java
index 538311280..0e6dac290 100755
--- a/src/main/java/storagecraft/container/ContainerBase.java
+++ b/src/main/java/storagecraft/container/ContainerBase.java
@@ -65,7 +65,8 @@ public abstract class ContainerBase extends Container
 			if (clickedButton == 2 || player.inventory.getItemStack() == null)
 			{
 				slot.putStack(null);
-			} else if (slot.isItemValid(player.inventory.getItemStack()))
+			}
+			else if (slot.isItemValid(player.inventory.getItemStack()))
 			{
 				slot.putStack(player.inventory.getItemStack().copy());
 			}
diff --git a/src/main/java/storagecraft/container/ContainerDrive.java b/src/main/java/storagecraft/container/ContainerDrive.java
index 0edc1f955..a5dc8870b 100755
--- a/src/main/java/storagecraft/container/ContainerDrive.java
+++ b/src/main/java/storagecraft/container/ContainerDrive.java
@@ -24,7 +24,8 @@ public class ContainerDrive extends ContainerBase
 			{
 				x = 71;
 				y += 18;
-			} else
+			}
+			else
 			{
 				x += 18;
 			}
@@ -50,7 +51,8 @@ public class ContainerDrive extends ContainerBase
 				{
 					return null;
 				}
-			} else if (!mergeItemStack(stack, 0, 8, false))
+			}
+			else if (!mergeItemStack(stack, 0, 8, false))
 			{
 				return null;
 			}
@@ -58,7 +60,8 @@ public class ContainerDrive extends ContainerBase
 			if (stack.stackSize == 0)
 			{
 				slot.putStack(null);
-			} else
+			}
+			else
 			{
 				slot.onSlotChanged();
 			}
diff --git a/src/main/java/storagecraft/container/ContainerSolderer.java b/src/main/java/storagecraft/container/ContainerSolderer.java
index f4b0113ef..54b8ff796 100755
--- a/src/main/java/storagecraft/container/ContainerSolderer.java
+++ b/src/main/java/storagecraft/container/ContainerSolderer.java
@@ -44,7 +44,8 @@ public class ContainerSolderer extends ContainerBase
 				{
 					return null;
 				}
-			} else if (!mergeItemStack(stack, 0, 3, false))
+			}
+			else if (!mergeItemStack(stack, 0, 3, false))
 			{
 				return null;
 			}
@@ -52,7 +53,8 @@ public class ContainerSolderer extends ContainerBase
 			if (stack.stackSize == 0)
 			{
 				slot.putStack(null);
-			} else
+			}
+			else
 			{
 				slot.onSlotChanged();
 			}
diff --git a/src/main/java/storagecraft/container/ContainerWirelessTransmitter.java b/src/main/java/storagecraft/container/ContainerWirelessTransmitter.java
index e57ed1e0a..d19113605 100755
--- a/src/main/java/storagecraft/container/ContainerWirelessTransmitter.java
+++ b/src/main/java/storagecraft/container/ContainerWirelessTransmitter.java
@@ -39,7 +39,8 @@ public class ContainerWirelessTransmitter extends ContainerBase
 				{
 					return null;
 				}
-			} else if (!mergeItemStack(stack, 0, 3, false))
+			}
+			else if (!mergeItemStack(stack, 0, 3, false))
 			{
 				return null;
 			}
@@ -47,7 +48,8 @@ public class ContainerWirelessTransmitter extends ContainerBase
 			if (stack.stackSize == 0)
 			{
 				slot.putStack(null);
-			} else
+			}
+			else
 			{
 				slot.onSlotChanged();
 			}
diff --git a/src/main/java/storagecraft/gui/GuiDetector.java b/src/main/java/storagecraft/gui/GuiDetector.java
index 22ec390c3..6f5c6e46c 100755
--- a/src/main/java/storagecraft/gui/GuiDetector.java
+++ b/src/main/java/storagecraft/gui/GuiDetector.java
@@ -75,7 +75,8 @@ public class GuiDetector extends GuiBase
 			{
 				StorageCraft.NETWORK.sendToServer(new MessageDetectorAmountUpdate(detector, result));
 			}
-		} else
+		}
+		else
 		{
 			super.keyTyped(character, keyCode);
 		}
diff --git a/src/main/java/storagecraft/gui/GuiGrid.java b/src/main/java/storagecraft/gui/GuiGrid.java
index 5a631d3c7..d0f2077d4 100755
--- a/src/main/java/storagecraft/gui/GuiGrid.java
+++ b/src/main/java/storagecraft/gui/GuiGrid.java
@@ -133,7 +133,8 @@ public class GuiGrid extends GuiBase
 		if (grid.getType() == EnumGridType.CRAFTING)
 		{
 			bindTexture("gui/crafting_grid.png");
-		} else
+		}
+		else
 		{
 			bindTexture("gui/grid.png");
 		}
@@ -306,13 +307,16 @@ public class GuiGrid extends GuiBase
 			if (isHoveringOverSlot() && container.getPlayer().inventory.getItemStack() != null)
 			{
 				StorageCraft.NETWORK.sendToServer(new MessageStoragePush(controller.getPos().getX(), controller.getPos().getY(), controller.getPos().getZ(), -1, clickedButton == 1));
-			} else if (isHoveringOverValidSlot() && container.getPlayer().inventory.getItemStack() == null)
+			}
+			else if (isHoveringOverValidSlot() && container.getPlayer().inventory.getItemStack() == null)
 			{
 				StorageCraft.NETWORK.sendToServer(new MessageStoragePull(controller.getPos().getX(), controller.getPos().getY(), controller.getPos().getZ(), hoveringId, clickedButton == 1, Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)));
-			} else if (clickedClear)
+			}
+			else if (clickedClear)
 			{
 				StorageCraft.NETWORK.sendToServer(new MessageGridCraftingClear(grid));
-			} else
+			}
+			else
 			{
 				for (Slot slot : container.getPlayerInventorySlots())
 				{
@@ -338,7 +342,8 @@ public class GuiGrid extends GuiBase
 	{
 		if (!checkHotbarKeys(keyCode) && searchField.textboxKeyTyped(character, keyCode))
 		{
-		} else
+		}
+		else
 		{
 			super.keyTyped(character, keyCode);
 		}
diff --git a/src/main/java/storagecraft/gui/sidebutton/SideButtonCompare.java b/src/main/java/storagecraft/gui/sidebutton/SideButtonCompare.java
index 4e38259c1..1cc33f180 100755
--- a/src/main/java/storagecraft/gui/sidebutton/SideButtonCompare.java
+++ b/src/main/java/storagecraft/gui/sidebutton/SideButtonCompare.java
@@ -27,7 +27,8 @@ public class SideButtonCompare extends SideButton
 		if ((setting.getCompare() & mask) == mask)
 		{
 			builder.append(gui.t("misc.storagecraft:yes"));
-		} else
+		}
+		else
 		{
 			builder.append(gui.t("misc.storagecraft:no"));
 		}
diff --git a/src/main/java/storagecraft/inventory/InventorySimple.java b/src/main/java/storagecraft/inventory/InventorySimple.java
index 1c84b0c92..ffe2aac60 100755
--- a/src/main/java/storagecraft/inventory/InventorySimple.java
+++ b/src/main/java/storagecraft/inventory/InventorySimple.java
@@ -40,7 +40,8 @@ public class InventorySimple implements IInventory
 			if (stack.stackSize <= amount)
 			{
 				setInventorySlotContents(slot, null);
-			} else
+			}
+			else
 			{
 				stack = stack.splitStack(amount);
 
diff --git a/src/main/java/storagecraft/item/ItemStorageCell.java b/src/main/java/storagecraft/item/ItemStorageCell.java
index 4a560f994..583a0c7e6 100755
--- a/src/main/java/storagecraft/item/ItemStorageCell.java
+++ b/src/main/java/storagecraft/item/ItemStorageCell.java
@@ -44,7 +44,8 @@ public class ItemStorageCell extends ItemBase
 		if (getCapacity(cell) == -1)
 		{
 			list.add(String.format(StatCollector.translateToLocal("misc.storagecraft:storage_cell_stored"), getStored(cell)));
-		} else
+		}
+		else
 		{
 			list.add(String.format(StatCollector.translateToLocal("misc.storagecraft:storage_cell_stored_capacity"), getStored(cell), getCapacity(cell)));
 		}
diff --git a/src/main/java/storagecraft/item/ItemWirelessGrid.java b/src/main/java/storagecraft/item/ItemWirelessGrid.java
index 994775e18..0bedd25e3 100755
--- a/src/main/java/storagecraft/item/ItemWirelessGrid.java
+++ b/src/main/java/storagecraft/item/ItemWirelessGrid.java
@@ -76,23 +76,28 @@ public class ItemWirelessGrid extends ItemBase
 							if (grid == null)
 							{
 								player.addChatComponentMessage(new ChatComponentText(StatCollector.translateToLocal("misc.storagecraft:wireless_grid.no_grid." + stack.getItemDamage())));
-							} else
+							}
+							else
 							{
 								player.openGui(StorageCraft.INSTANCE, StorageCraftGUI.GRID, world, grid.getPos().getX(), grid.getPos().getY(), grid.getPos().getZ());
 							}
-						} else
+						}
+						else
 						{
 							player.addChatComponentMessage(new ChatComponentText(StatCollector.translateToLocal("misc.storagecraft:wireless_grid.not_working")));
 						}
-					} else
+					}
+					else
 					{
 						player.addChatComponentMessage(new ChatComponentText(StatCollector.translateToLocal("misc.storagecraft:wireless_grid.not_found")));
 					}
-				} else
+				}
+				else
 				{
 					player.addChatComponentMessage(new ChatComponentText(StatCollector.translateToLocal("misc.storagecraft:wireless_grid.out_of_range")));
 				}
-			} else
+			}
+			else
 			{
 				player.addChatComponentMessage(new ChatComponentText(StatCollector.translateToLocal("misc.storagecraft:wireless_grid.not_set." + stack.getItemDamage())));
 			}
diff --git a/src/main/java/storagecraft/network/MessageStoragePull.java b/src/main/java/storagecraft/network/MessageStoragePull.java
index 23e35c6bd..4552dcf52 100755
--- a/src/main/java/storagecraft/network/MessageStoragePull.java
+++ b/src/main/java/storagecraft/network/MessageStoragePull.java
@@ -89,7 +89,8 @@ public class MessageStoragePull extends MessageHandlerPlayerToServer<MessageStor
 						{
 							controller.push(took);
 						}
-					} else
+					}
+					else
 					{
 						player.inventory.setItemStack(took);
 						player.updateHeldItem();
diff --git a/src/main/java/storagecraft/network/MessageStoragePush.java b/src/main/java/storagecraft/network/MessageStoragePush.java
index 83ba676b0..93dc7ec21 100755
--- a/src/main/java/storagecraft/network/MessageStoragePush.java
+++ b/src/main/java/storagecraft/network/MessageStoragePush.java
@@ -68,7 +68,8 @@ public class MessageStoragePush extends MessageHandlerPlayerToServer<MessageStor
 				{
 					stack.stackSize = 1;
 				}
-			} else
+			}
+			else
 			{
 				stack = player.inventory.getStackInSlot(message.slot);
 			}
@@ -89,13 +90,15 @@ public class MessageStoragePush extends MessageHandlerPlayerToServer<MessageStor
 							{
 								player.inventory.setItemStack(null);
 							}
-						} else
+						}
+						else
 						{
 							player.inventory.setItemStack(null);
 						}
 
 						player.updateHeldItem();
-					} else
+					}
+					else
 					{
 						player.inventory.setInventorySlotContents(message.slot, null);
 					}
diff --git a/src/main/java/storagecraft/render/model/CableModel.java b/src/main/java/storagecraft/render/model/CableModel.java
index 1c886e9d3..c277bf773 100755
--- a/src/main/java/storagecraft/render/model/CableModel.java
+++ b/src/main/java/storagecraft/render/model/CableModel.java
@@ -58,7 +58,8 @@ public class CableModel extends ModelBase
 		if (cable.getItemDamage() == 1)
 		{
 			Minecraft.getMinecraft().renderEngine.bindTexture(CABLE_UNPOWERED_RESOURCE);
-		} else
+		}
+		else
 		{
 			Minecraft.getMinecraft().renderEngine.bindTexture(CABLE_RESOURCE);
 		}
@@ -81,11 +82,13 @@ public class CableModel extends ModelBase
 			if (cable.isPowered())
 			{
 				Minecraft.getMinecraft().renderEngine.bindTexture(CABLE_POWERED_RESOURCE);
-			} else
+			}
+			else
 			{
 				Minecraft.getMinecraft().renderEngine.bindTexture(CABLE_UNPOWERED_RESOURCE);
 			}
-		} else
+		}
+		else
 		{
 			Minecraft.getMinecraft().renderEngine.bindTexture(CABLE_RESOURCE);
 		}
diff --git a/src/main/java/storagecraft/tile/TileCable.java b/src/main/java/storagecraft/tile/TileCable.java
index 038f2ae28..c2f3222ba 100755
--- a/src/main/java/storagecraft/tile/TileCable.java
+++ b/src/main/java/storagecraft/tile/TileCable.java
@@ -85,10 +85,12 @@ public class TileCable extends TileBase
 				machines.add((TileMachine) tile);
 
 				visited.add(newPos);
-			} else if (tile instanceof TileCable && ((TileCable) tile).isEnabled())
+			}
+			else if (tile instanceof TileCable && ((TileCable) tile).isEnabled())
 			{
 				((TileCable) tile).addMachines(visited, machines, controller);
-			} else if (tile instanceof TileController && !controller.getPos().equals(newPos))
+			}
+			else if (tile instanceof TileController && !controller.getPos().equals(newPos))
 			{
 				worldObj.createExplosion(null, pos.getX(), pos.getY(), pos.getZ(), 4.5f, true);
 			}
diff --git a/src/main/java/storagecraft/tile/TileController.java b/src/main/java/storagecraft/tile/TileController.java
index 1d06a87ab..f4bc7d5ce 100755
--- a/src/main/java/storagecraft/tile/TileController.java
+++ b/src/main/java/storagecraft/tile/TileController.java
@@ -49,7 +49,8 @@ public class TileController extends TileBase implements IEnergyReceiver, INetwor
 				if (!isActive())
 				{
 					disconnectAll();
-				} else
+				}
+				else
 				{
 					visitedCables.clear();
 
@@ -246,7 +247,8 @@ public class TileController extends TileBase implements IEnergyReceiver, INetwor
 				if (newStack == null)
 				{
 					newStack = took;
-				} else
+				}
+				else
 				{
 					newStack.stackSize += took.stackSize;
 				}
diff --git a/src/main/java/storagecraft/tile/TileDetector.java b/src/main/java/storagecraft/tile/TileDetector.java
index bbebdf947..22371801d 100755
--- a/src/main/java/storagecraft/tile/TileDetector.java
+++ b/src/main/java/storagecraft/tile/TileDetector.java
@@ -83,15 +83,18 @@ public class TileDetector extends TileMachine implements IInventory, ISidedInven
 					if (mode == MODE_UNDER && amount != 0)
 					{
 						providesPower = true;
-					} else if (mode == MODE_EQUAL && amount == 0)
+					}
+					else if (mode == MODE_EQUAL && amount == 0)
 					{
 						providesPower = true;
-					} else
+					}
+					else
 					{
 						providesPower = false;
 					}
 				}
-			} else
+			}
+			else
 			{
 				providesPower = false;
 			}
diff --git a/src/main/java/storagecraft/tile/TileExporter.java b/src/main/java/storagecraft/tile/TileExporter.java
index 4af51ec7c..e86c2b243 100755
--- a/src/main/java/storagecraft/tile/TileExporter.java
+++ b/src/main/java/storagecraft/tile/TileExporter.java
@@ -73,10 +73,12 @@ public class TileExporter extends TileMachine implements IInventory, ISidedInven
 								{
 									getController().push(took);
 								}
-							} else if (InventoryUtils.canPushToInventory(connectedInventory, took))
+							}
+							else if (InventoryUtils.canPushToInventory(connectedInventory, took))
 							{
 								InventoryUtils.pushToInventory(connectedInventory, took);
-							} else
+							}
+							else
 							{
 								getController().push(took);
 							}
diff --git a/src/main/java/storagecraft/tile/TileImporter.java b/src/main/java/storagecraft/tile/TileImporter.java
index e219655b2..f29552e49 100755
--- a/src/main/java/storagecraft/tile/TileImporter.java
+++ b/src/main/java/storagecraft/tile/TileImporter.java
@@ -69,7 +69,8 @@ public class TileImporter extends TileMachine implements IInventory, ISidedInven
 								connectedInventory.setInventorySlotContents(currentSlot, null);
 							}
 						}
-					} else if (getController().push(slot.copy()))
+					}
+					else if (getController().push(slot.copy()))
 					{
 						connectedInventory.setInventorySlotContents(currentSlot, null);
 					}
@@ -104,7 +105,8 @@ public class TileImporter extends TileMachine implements IInventory, ISidedInven
 					if (mode == MODE_WHITELIST)
 					{
 						return true;
-					} else if (mode == MODE_BLACKLIST)
+					}
+					else if (mode == MODE_BLACKLIST)
 					{
 						return false;
 					}
diff --git a/src/main/java/storagecraft/tile/TileSolderer.java b/src/main/java/storagecraft/tile/TileSolderer.java
index 670893a92..e6e11e8f3 100755
--- a/src/main/java/storagecraft/tile/TileSolderer.java
+++ b/src/main/java/storagecraft/tile/TileSolderer.java
@@ -41,14 +41,16 @@ public class TileSolderer extends TileMachine implements IInventory, ISidedInven
 		if (newRecipe == null)
 		{
 			reset();
-		} else if (newRecipe != recipe && inventory.getStackInSlot(3) == null)
+		}
+		else if (newRecipe != recipe && inventory.getStackInSlot(3) == null)
 		{
 			recipe = newRecipe;
 			progress = 0;
 			working = true;
 
 			markDirty();
-		} else if (working)
+		}
+		else if (working)
 		{
 			progress++;
 
diff --git a/src/main/java/storagecraft/tile/TileWirelessTransmitter.java b/src/main/java/storagecraft/tile/TileWirelessTransmitter.java
index 59924c4f5..da6913b9a 100755
--- a/src/main/java/storagecraft/tile/TileWirelessTransmitter.java
+++ b/src/main/java/storagecraft/tile/TileWirelessTransmitter.java
@@ -40,7 +40,8 @@ public class TileWirelessTransmitter extends TileMachine implements IInventory
 			{
 				reset();
 			}
-		} else if (inventory.getStackInSlot(0) != null)
+		}
+		else if (inventory.getStackInSlot(0) != null)
 		{
 			inventory.decrStackSize(0, 1);
 
diff --git a/src/main/java/storagecraft/tile/solderer/SoldererRecipeCraftingGrid.java b/src/main/java/storagecraft/tile/solderer/SoldererRecipeCraftingGrid.java
index 073499883..c5f8eeb0e 100755
--- a/src/main/java/storagecraft/tile/solderer/SoldererRecipeCraftingGrid.java
+++ b/src/main/java/storagecraft/tile/solderer/SoldererRecipeCraftingGrid.java
@@ -14,10 +14,12 @@ public class SoldererRecipeCraftingGrid implements ISoldererRecipe
 		if (row == 0)
 		{
 			return new ItemStack(StorageCraftItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED);
-		} else if (row == 1)
+		}
+		else if (row == 1)
 		{
 			return new ItemStack(StorageCraftBlocks.GRID, 1, 0);
-		} else if (row == 2)
+		}
+		else if (row == 2)
 		{
 			return new ItemStack(Blocks.crafting_table);
 		}
diff --git a/src/main/java/storagecraft/tile/solderer/SoldererRecipeDrive.java b/src/main/java/storagecraft/tile/solderer/SoldererRecipeDrive.java
index c80ca6c5d..648681eae 100755
--- a/src/main/java/storagecraft/tile/solderer/SoldererRecipeDrive.java
+++ b/src/main/java/storagecraft/tile/solderer/SoldererRecipeDrive.java
@@ -14,10 +14,12 @@ public class SoldererRecipeDrive implements ISoldererRecipe
 		if (row == 0)
 		{
 			return new ItemStack(StorageCraftItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED);
-		} else if (row == 1)
+		}
+		else if (row == 1)
 		{
 			return new ItemStack(StorageCraftBlocks.MACHINE_CASING);
-		} else if (row == 2)
+		}
+		else if (row == 2)
 		{
 			return new ItemStack(Blocks.chest);
 		}
diff --git a/src/main/java/storagecraft/tile/solderer/SoldererRecipeProcessor.java b/src/main/java/storagecraft/tile/solderer/SoldererRecipeProcessor.java
index 5b5b42b05..d36a42dcf 100755
--- a/src/main/java/storagecraft/tile/solderer/SoldererRecipeProcessor.java
+++ b/src/main/java/storagecraft/tile/solderer/SoldererRecipeProcessor.java
@@ -28,10 +28,12 @@ public class SoldererRecipeProcessor implements ISoldererRecipe
 				case ItemProcessor.TYPE_ADVANCED:
 					return new ItemStack(StorageCraftItems.PROCESSOR, 1, ItemProcessor.TYPE_PRINTED_ADVANCED);
 			}
-		} else if (row == 1)
+		}
+		else if (row == 1)
 		{
 			return new ItemStack(Items.redstone);
-		} else if (row == 2)
+		}
+		else if (row == 2)
 		{
 			return new ItemStack(StorageCraftItems.PROCESSOR, 1, ItemProcessor.TYPE_PRINTED_SILICON);
 		}
diff --git a/src/main/java/storagecraft/tile/solderer/SoldererRecipeWirelessGrid.java b/src/main/java/storagecraft/tile/solderer/SoldererRecipeWirelessGrid.java
index d377c21c0..85028601a 100755
--- a/src/main/java/storagecraft/tile/solderer/SoldererRecipeWirelessGrid.java
+++ b/src/main/java/storagecraft/tile/solderer/SoldererRecipeWirelessGrid.java
@@ -20,10 +20,12 @@ public class SoldererRecipeWirelessGrid implements ISoldererRecipe
 		if (row == 0)
 		{
 			return new ItemStack(StorageCraftItems.WIRELESS_GRID_PLATE);
-		} else if (row == 1)
+		}
+		else if (row == 1)
 		{
 			return new ItemStack(StorageCraftBlocks.GRID, 1, type);
-		} else if (row == 2)
+		}
+		else if (row == 2)
 		{
 			return new ItemStack(StorageCraftItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED);
 		}
diff --git a/src/main/java/storagecraft/util/InventoryUtils.java b/src/main/java/storagecraft/util/InventoryUtils.java
index 119ca8452..5a6ccfbc8 100755
--- a/src/main/java/storagecraft/util/InventoryUtils.java
+++ b/src/main/java/storagecraft/util/InventoryUtils.java
@@ -107,7 +107,8 @@ public class InventoryUtils
 		if (slot == null)
 		{
 			inventory.setInventorySlotContents(i, stack);
-		} else if (compareStackNoQuantity(slot, stack))
+		}
+		else if (compareStackNoQuantity(slot, stack))
 		{
 			slot.stackSize += stack.stackSize;
 		}
@@ -143,7 +144,8 @@ public class InventoryUtils
 				inventory.setInventorySlotContents(i, stack);
 
 				return;
-			} else if (compareStackNoQuantity(slot, stack))
+			}
+			else if (compareStackNoQuantity(slot, stack))
 			{
 				int toAdd = toGo;
 
@@ -175,7 +177,8 @@ public class InventoryUtils
 			if (slot == null)
 			{
 				return true;
-			} else if (compareStackNoQuantity(slot, stack))
+			}
+			else if (compareStackNoQuantity(slot, stack))
 			{
 				int toAdd = toGo;