diff --git a/src/main/java/cpw/mods/ironchest/IronChestType.java b/src/main/java/cpw/mods/ironchest/IronChestType.java
index 981c478..119f5a6 100644
--- a/src/main/java/cpw/mods/ironchest/IronChestType.java
+++ b/src/main/java/cpw/mods/ironchest/IronChestType.java
@@ -140,27 +140,27 @@ public enum IronChestType {
 
     public static Object translateOreName(String mat)
     {
-        if (mat == "ingotIron")
+        if (mat.equals("ingotIron"))
         {
             return Items.iron_ingot;
         }
-        else if (mat == "ingotGold")
+        else if (mat.equals("ingotGold"))
         {
             return Items.gold_ingot;
         }
-        else if (mat == "gemDiamond")
+        else if (mat.equals("gemDiamond"))
         {
             return Items.diamond;
         }
-        else if (mat == "blockGlass")
+        else if (mat.equals("blockGlass"))
         {
             return Blocks.glass;
         }
-        else if (mat == "obsidian")
+        else if (mat.equals("obsidian"))
         {
             return Blocks.obsidian;
         }
-        else if (mat == "dirt")
+        else if (mat.equals("dirt"))
         {
             return Blocks.dirt;
         }
diff --git a/src/main/java/cpw/mods/ironchest/OcelotsSitOnChestsHandler.java b/src/main/java/cpw/mods/ironchest/OcelotsSitOnChestsHandler.java
index 3e3283e..1e42515 100644
--- a/src/main/java/cpw/mods/ironchest/OcelotsSitOnChestsHandler.java
+++ b/src/main/java/cpw/mods/ironchest/OcelotsSitOnChestsHandler.java
@@ -17,11 +17,8 @@ public class OcelotsSitOnChestsHandler {
             @SuppressWarnings("unchecked")
             List<EntityAITasks.EntityAITaskEntry> tasks = ocelot.tasks.taskEntries;
 
-            for (int i = 0; i < tasks.size(); i++)
-            {
-                EntityAITasks.EntityAITaskEntry task = tasks.get(i);
-                if (task.priority == 6 && (task.action instanceof EntityAIOcelotSit) && !(task.action instanceof IronChestAIOcelotSit))
-                {
+            for (EntityAITasks.EntityAITaskEntry task : tasks) {
+                if (task.priority == 6 && (task.action instanceof EntityAIOcelotSit) && !(task.action instanceof IronChestAIOcelotSit)) {
                     task.action = new IronChestAIOcelotSit(ocelot, 0.4F);
                 }
             }
diff --git a/src/main/java/cpw/mods/ironchest/TileEntityIronChest.java b/src/main/java/cpw/mods/ironchest/TileEntityIronChest.java
index be2481b..17f8fd8 100644
--- a/src/main/java/cpw/mods/ironchest/TileEntityIronChest.java
+++ b/src/main/java/cpw/mods/ironchest/TileEntityIronChest.java
@@ -280,14 +280,9 @@ public class TileEntityIronChest extends TileEntity implements IInventory {
             float var1 = 5.0F;
             @SuppressWarnings("unchecked")
             List<EntityPlayer> var2 = this.worldObj.getEntitiesWithinAABB(EntityPlayer.class, AxisAlignedBB.getBoundingBox((double)((float)this.xCoord - var1), (double)((float)this.yCoord - var1), (double)((float)this.zCoord - var1), (double)((float)(this.xCoord + 1) + var1), (double)((float)(this.yCoord + 1) + var1), (double)((float)(this.zCoord + 1) + var1)));
-            Iterator<EntityPlayer> var3 = var2.iterator();
 
-            while (var3.hasNext())
-            {
-                EntityPlayer var4 = var3.next();
-
-                if (var4.openContainer instanceof ContainerIronChest)
-                {
+            for (EntityPlayer var4 : var2) {
+                if (var4.openContainer instanceof ContainerIronChest) {
                     ++this.numUsingPlayers;
                 }
             }