diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index ec2080d2ae..d19bc0af7e 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -216,9 +216,11 @@ public abstract class EntityLiving extends Entity {
 
             this.extinguish();
         } else {
-            if (this.getAirTicks() != 300) { // CraftBukkit - only set if needed to work around a datawatcher inefficiency
+            // CraftBukkit start - only set if needed to work around a datawatcher inefficiency
+            if (this.getAirTicks() != 300) {
                 this.setAirTicks(maxAirTicks);
             }
+            // CraftBukkit end
         }
 
         this.ax = this.ay;
diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
index 991a9c43ae..c779688eae 100644
--- a/src/main/java/net/minecraft/server/SpawnerCreature.java
+++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
@@ -6,16 +6,17 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
 
-// CraftBukkit
+// CraftBukkit start
 import java.util.ArrayList;
 import org.bukkit.craftbukkit.util.LongBaseHashtable;
 import org.bukkit.craftbukkit.util.EntryBase;
 import org.bukkit.craftbukkit.util.LongHash;
 import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
+// CraftBukkit end
 
 public final class SpawnerCreature {
-
-    // private static HashMap b = new HashMap(); // CraftBukkit - moved local to spawnEntities
+    // CraftBukkit start
+    // private static HashMap b = new HashMap(); // Moved local to spawnEntities
     static private class ChunkEntry extends EntryBase {
         public boolean spawn;
 
@@ -32,6 +33,7 @@ public final class SpawnerCreature {
             return LongHash.lsw(key);
         }
     }
+    // CraftBukkit end
 
     protected static final Class[] a = new Class[] { EntitySpider.class, EntityZombie.class, EntitySkeleton.class};
 
@@ -49,8 +51,10 @@ public final class SpawnerCreature {
         if (!flag && !flag1) {
             return 0;
         } else {
-            // b.clear(); // CraftBukkit
-            LongBaseHashtable chunkCoords = new LongBaseHashtable(); // CraftBukkit
+            // CraftBukkit start
+            // b.clear();
+            LongBaseHashtable chunkCoords = new LongBaseHashtable();
+            // CraftBukkit end
 
             int i;
             int j;