diff --git a/api/buildcraft/api/core/EnumColor.java b/api/buildcraft/api/core/EnumColor.java
index 467dce1c..daf0d4a3 100644
--- a/api/buildcraft/api/core/EnumColor.java
+++ b/api/buildcraft/api/core/EnumColor.java
@@ -107,7 +107,7 @@ public enum EnumColor {
 		0xe4e4e4};
 
 	@SideOnly(Side.CLIENT)
-	private static IIcon brushIcons[] = new IIcon[16];
+	private static IIcon[] brushIcons = new IIcon[16];
 
 	public int getDarkHex() {
 		return DARK_HEX[ordinal()];
diff --git a/common/buildcraft/commander/BlockZonePlan.java b/common/buildcraft/commander/BlockZonePlan.java
index 82ae6605..c88d8c7f 100755
--- a/common/buildcraft/commander/BlockZonePlan.java
+++ b/common/buildcraft/commander/BlockZonePlan.java
@@ -37,7 +37,7 @@ public class BlockZonePlan extends BlockBuildCraft {
 	}
 
 	@Override
-	public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) {
+	public TileEntity createNewTileEntity(World world, int meta) {
 		return new TileZonePlan();
 	}
 
diff --git a/common/buildcraft/commander/ContainerZonePlan.java b/common/buildcraft/commander/ContainerZonePlan.java
index f2481bc2..dbc2d9d8 100755
--- a/common/buildcraft/commander/ContainerZonePlan.java
+++ b/common/buildcraft/commander/ContainerZonePlan.java
@@ -51,7 +51,7 @@ public class ContainerZonePlan extends BuildCraftContainer {
 	}
 
 	@Override
-	public boolean canInteractWith(EntityPlayer p_75145_1_) {
+	public boolean canInteractWith(EntityPlayer player) {
 		return true;
 	}
 
@@ -109,9 +109,9 @@ public class ContainerZonePlan extends BuildCraftContainer {
 					}
 				}
 
-				r /= (blocksPerPixel * blocksPerPixel);
-				g /= (blocksPerPixel * blocksPerPixel);
-				b /= (blocksPerPixel * blocksPerPixel);
+				r /= blocksPerPixel * blocksPerPixel;
+				g /= blocksPerPixel * blocksPerPixel;
+				b /= blocksPerPixel * blocksPerPixel;
 
 				r /= 255F;
 				g /= 255F;
diff --git a/common/buildcraft/commander/GuiZonePlan.java b/common/buildcraft/commander/GuiZonePlan.java
index 13d795d5..d51b2490 100755
--- a/common/buildcraft/commander/GuiZonePlan.java
+++ b/common/buildcraft/commander/GuiZonePlan.java
@@ -28,23 +28,24 @@ import buildcraft.core.network.RPCHandler;
 
 public class GuiZonePlan extends GuiAdvancedInterface {
 
+	private static final ResourceLocation TMP_TEXTURE = new ResourceLocation("buildcraft",
+			DefaultProps.TEXTURE_PATH_GUI + "/map_gui.png");
+
 	private int mapWidth = 200;
 	private int mapHeight = 100;
 
 	private TileZonePlan zonePlan;
 
 	private BCDynamicTexture newSelection;
-	private int selX1 = 0,
-			selX2 = 0,
-			selY1 = 0,
-			selY2 = 0;
+	private int selX1 = 0;
+	private int selX2 = 0;
+	private int selY1 = 0;
+	private int selY2 = 0;
+
 	private boolean inSelection = false;
 
 	private BCDynamicTexture currentSelection;
 
-	private static final ResourceLocation TMP_TEXTURE = new ResourceLocation("buildcraft",
-			DefaultProps.TEXTURE_PATH_GUI + "/map_gui.png");
-
 	private int mapXMin = 0;
 	private int mapYMin = 0;
 
@@ -360,9 +361,9 @@ public class GuiZonePlan extends GuiAdvancedInterface {
 					}
 				}
 
-				r /= (zoomLevel * zoomLevel);
-				g /= (zoomLevel * zoomLevel);
-				b /= (zoomLevel * zoomLevel);
+				r /= zoomLevel * zoomLevel;
+				g /= zoomLevel * zoomLevel;
+				b /= zoomLevel * zoomLevel;
 
 				r /= 255F;
 				g /= 255F;
diff --git a/common/buildcraft/commander/TileZonePlan.java b/common/buildcraft/commander/TileZonePlan.java
index 64868614..ec300534 100755
--- a/common/buildcraft/commander/TileZonePlan.java
+++ b/common/buildcraft/commander/TileZonePlan.java
@@ -53,8 +53,8 @@ public class TileZonePlan extends TileBuildCraft implements IInventory {
 	}
 
 	private int[] getCoords() {
-		int chunkCenterX = (xCoord >> 4);
-		int chunkCenterZ = (zCoord >> 4);
+		int chunkCenterX = xCoord >> 4;
+		int chunkCenterZ = zCoord >> 4;
 
 		if (chunkIt == 0) {
 			return new int[] {chunkCenterX, chunkCenterZ};
diff --git a/common/buildcraft/core/ChunkIndex.java b/common/buildcraft/core/ChunkIndex.java
index 4db19a36..23116b88 100755
--- a/common/buildcraft/core/ChunkIndex.java
+++ b/common/buildcraft/core/ChunkIndex.java
@@ -40,7 +40,7 @@ public class ChunkIndex {
 
 	@Override
 	public int hashCode() {
-		return (x * 37 + z);
+		return x * 37 + z;
 	}
 
 	public void writeToNBT(NBTTagCompound nbt) {
diff --git a/common/buildcraft/energy/BlockBuildcraftFluid.java b/common/buildcraft/energy/BlockBuildcraftFluid.java
index cd1b273e..4fdb89b7 100644
--- a/common/buildcraft/energy/BlockBuildcraftFluid.java
+++ b/common/buildcraft/energy/BlockBuildcraftFluid.java
@@ -139,7 +139,7 @@ public class BlockBuildcraftFluid extends BlockFluidClassic {
 	}
 
 	@Override
-	public MapColor getMapColor(int p_149728_1_) {
+	public MapColor getMapColor(int meta) {
 		return mapColor;
 	}
 }