diff --git a/src/main/java/refinedstorage/api/network/IGridHandler.java b/src/main/java/refinedstorage/api/network/IGridHandler.java
index 8e2c9a53d..b79760c3d 100755
--- a/src/main/java/refinedstorage/api/network/IGridHandler.java
+++ b/src/main/java/refinedstorage/api/network/IGridHandler.java
@@ -6,7 +6,7 @@ import net.minecraft.item.ItemStack;
 import javax.annotation.Nullable;
 
 /**
- * Defines the behaviour of grids.
+ * Defines the behavior of grids.
  */
 public interface IGridHandler {
     /**
diff --git a/src/main/java/refinedstorage/api/network/IWirelessGridHandler.java b/src/main/java/refinedstorage/api/network/IWirelessGridHandler.java
index 59efba206..9e1282758 100755
--- a/src/main/java/refinedstorage/api/network/IWirelessGridHandler.java
+++ b/src/main/java/refinedstorage/api/network/IWirelessGridHandler.java
@@ -6,7 +6,7 @@ import net.minecraft.util.EnumHand;
 import javax.annotation.Nullable;
 
 /**
- * Defines behaviour of wireless grids.
+ * Defines behavior of wireless grids.
  */
 public interface IWirelessGridHandler {
     /**
diff --git a/src/main/java/refinedstorage/tile/controller/TileController.java b/src/main/java/refinedstorage/tile/controller/TileController.java
index 1791519a8..fbe23beb7 100755
--- a/src/main/java/refinedstorage/tile/controller/TileController.java
+++ b/src/main/java/refinedstorage/tile/controller/TileController.java
@@ -354,6 +354,7 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR
         return patterns.get(highestPattern);
     }
 
+    @Override
     public void rebuildPatterns() {
         patterns.clear();
 
@@ -561,6 +562,21 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR
         return energy.getEnergyStored();
     }
 
+    @Override
+    public long getStoredPower() {
+        return energy.getEnergyStored();
+    }
+
+    @Override
+    public long getCapacity() {
+        return energy.getMaxEnergyStored();
+    }
+
+    @Override
+    public long givePower(long power, boolean simulated) {
+        return energy.receiveEnergy((int) power, simulated);
+    }
+
     public int getEnergyScaled(int i) {
         return (int) ((float) energy.getEnergyStored() / (float) energy.getMaxEnergyStored() * (float) i);
     }
@@ -593,6 +609,7 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR
         this.redstoneMode = mode;
     }
 
+    @Override
     public int getEnergyUsage() {
         if (!worldObj.isRemote) {
             int usage = 0;
@@ -702,19 +719,4 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR
     public boolean hasCapability(Capability<?> capability, EnumFacing facing) {
         return capability == TeslaCapabilities.CAPABILITY_HOLDER || capability == TeslaCapabilities.CAPABILITY_CONSUMER || super.hasCapability(capability, facing);
     }
-
-    @Override
-    public long getStoredPower() {
-        return energy.getEnergyStored();
-    }
-
-    @Override
-    public long getCapacity() {
-        return energy.getMaxEnergyStored();
-    }
-
-    @Override
-    public long givePower(long power, boolean simulated) {
-        return energy.receiveEnergy((int) power, simulated);
-    }
 }