diff --git a/src/main/java/refinedstorage/gui/GuiGrid.java b/src/main/java/refinedstorage/gui/GuiGrid.java
index 1fbd68855..7ad26dabd 100755
--- a/src/main/java/refinedstorage/gui/GuiGrid.java
+++ b/src/main/java/refinedstorage/gui/GuiGrid.java
@@ -170,21 +170,18 @@ public class GuiGrid extends GuiBase {
     }
 
     public boolean isHoveringOverClear(int mouseX, int mouseY) {
-        if (grid.getType() == EnumGridType.CRAFTING) {
-            return inBounds(81, 105, 7, 7, mouseX, mouseY);
-        } else if (grid.getType() == EnumGridType.PATTERN) {
-            return inBounds(64, 105, 7, 7, mouseX, mouseY);
+        switch (grid.getType()) {
+            case CRAFTING:
+                return inBounds(81, 105, 7, 7, mouseX, mouseY);
+            case PATTERN:
+                return inBounds(64, 105, 7, 7, mouseX, mouseY);
+            default:
+                return false;
         }
-
-        return false;
     }
 
     public boolean isHoveringOverCreatePattern(int mouseX, int mouseY) {
-        if (grid.getType() == EnumGridType.PATTERN) {
-            return inBounds(152, 124, 16, 16, mouseX, mouseY) && ((TileGrid) grid).mayCreatePattern();
-        }
-
-        return false;
+        return grid.getType() == EnumGridType.PATTERN && inBounds(152, 124, 16, 16, mouseX, mouseY) && ((TileGrid) grid).mayCreatePattern();
     }
 
     @Override
@@ -297,9 +294,9 @@ public class GuiGrid extends GuiBase {
         }
 
         if (qty >= 1000000) {
-            return String.format("%.1f", (float) qty / 1000000).replace(",", ".").replace(".0", "") + "M";
+            return String.format(Locale.US, "%.1f", Math.floor(qty / 1000000)).replace(".0", "") + "M";
         } else if (qty >= 1000) {
-            return String.format("%.1f", (float) qty / 1000).replace(",", ".").replace(".0", "") + "K";
+            return String.format(Locale.US, "%.1f", Math.floor(qty / 1000)).replace(".0", "") + "K";
         } else if (qty == 1) {
             return null;
         } else if (qty == 0) {
diff --git a/src/main/java/refinedstorage/tile/config/ModeConstants.java b/src/main/java/refinedstorage/tile/config/ModeConstants.java
index 169e52494..12dcc16f3 100755
--- a/src/main/java/refinedstorage/tile/config/ModeConstants.java
+++ b/src/main/java/refinedstorage/tile/config/ModeConstants.java
@@ -1,6 +1,6 @@
 package refinedstorage.tile.config;
 
-public class ModeConstants {
+public final class ModeConstants {
     public static final int WHITELIST = 0;
     public static final int BLACKLIST = 1;
 }
diff --git a/src/main/java/refinedstorage/tile/config/ModeFilter.java b/src/main/java/refinedstorage/tile/config/ModeFilter.java
index 50b72aabb..090916feb 100755
--- a/src/main/java/refinedstorage/tile/config/ModeFilter.java
+++ b/src/main/java/refinedstorage/tile/config/ModeFilter.java
@@ -4,7 +4,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraftforge.items.IItemHandler;
 import refinedstorage.RefinedStorageUtils;
 
-public class ModeFilter {
+public final class ModeFilter {
     public static boolean respectsMode(IItemHandler filters, IModeConfig mode, int compare, ItemStack stack) {
         if (mode.getMode() == ModeConstants.WHITELIST) {
             int slots = 0;
diff --git a/src/main/java/refinedstorage/tile/controller/ControllerSearcher.java b/src/main/java/refinedstorage/tile/controller/ControllerSearcher.java
index 5c300478b..d0fbd9894 100755
--- a/src/main/java/refinedstorage/tile/controller/ControllerSearcher.java
+++ b/src/main/java/refinedstorage/tile/controller/ControllerSearcher.java
@@ -9,7 +9,7 @@ import refinedstorage.tile.TileRelay;
 
 import java.util.Set;
 
-public class ControllerSearcher {
+public final class ControllerSearcher {
     public static TileController search(World world, BlockPos current, Set<String> visited) {
         if (visited.contains(current.getX() + "," + current.getY() + "," + current.getZ())) {
             return null;