From 31d346a5878aec53421ff5ff09b33a5505b689bb Mon Sep 17 00:00:00 2001
From: MattBDev <mattbdev@outlook.com>
Date: Tue, 29 Mar 2016 17:00:07 -0400
Subject: [PATCH] Minor code cleanup Plus an optimization

---
 .../com/plotsquared/bukkit/BukkitMain.java    |  28 ++-
 .../database/plotme/APlotMeConnector.java     |   8 +-
 .../bukkit/object/entity/EntityWrapper.java   | 133 +++++--------
 .../bukkit/util/BukkitSchematicHandler.java   |  25 +--
 .../bukkit/util/BukkitSetupUtils.java         |  28 ++-
 .../bukkit/util/block/FastQueue_1_8.java      |  11 +-
 .../bukkit/util/block/FastQueue_1_9.java      |   3 +-
 .../configuration/file/FileConfiguration.java |  33 ++--
 .../jnbt/ByteArrayTag.java                    |  26 +--
 .../intellectualcrafters/jnbt/ByteTag.java    |  22 +--
 .../jnbt/CompoundTag.java                     |   3 +-
 .../jnbt/CompoundTagBuilder.java              |  71 +++----
 .../intellectualcrafters/jnbt/DoubleTag.java  |  22 +--
 .../com/intellectualcrafters/jnbt/EndTag.java |   6 +-
 .../intellectualcrafters/jnbt/FloatTag.java   |  22 +--
 .../jnbt/IntArrayTag.java                     |  26 +--
 .../com/intellectualcrafters/jnbt/IntTag.java |  22 +--
 .../intellectualcrafters/jnbt/ListTag.java    | 138 ++++++-------
 .../jnbt/ListTagBuilder.java                  |  45 ++---
 .../intellectualcrafters/jnbt/LongTag.java    |  22 +--
 .../jnbt/NBTConstants.java                    |  14 +-
 .../jnbt/NBTInputStream.java                  | 109 +++++------
 .../jnbt/NBTOutputStream.java                 |  33 ++--
 .../intellectualcrafters/jnbt/NBTUtils.java   |  23 ++-
 .../intellectualcrafters/jnbt/ShortTag.java   |  22 +--
 .../intellectualcrafters/jnbt/StringTag.java  |  22 +--
 .../com/intellectualcrafters/jnbt/Tag.java    |  11 +-
 .../com/intellectualcrafters/plot/PS.java     | 183 +++++++++---------
 .../plot/commands/Area.java                   |  57 ++----
 .../plot/commands/BO3.java                    |  11 +-
 .../plot/commands/Cluster.java                |   3 +-
 .../plot/commands/Condense.java               |  30 ++-
 .../plot/commands/Database.java               |   7 +-
 .../plot/commands/GenerateDocs.java           | 100 +++++-----
 .../plot/commands/Help.java                   |  12 +-
 .../plot/commands/Inbox.java                  |  14 +-
 .../plot/commands/Info.java                   |  10 +-
 .../plot/commands/ListCmd.java                |  50 ++---
 .../plot/commands/Purge.java                  |  18 +-
 .../plot/commands/Rate.java                   |   5 +-
 .../plot/commands/Remove.java                 |   4 +-
 .../plot/commands/SchematicCmd.java           |   7 +-
 .../plot/commands/Set.java                    |  29 ++-
 .../plot/commands/SetHome.java                |   6 +-
 .../plot/commands/Setup.java                  |  27 +--
 .../plot/commands/Visit.java                  |  12 +-
 .../plot/database/DBFunc.java                 | 106 +++++-----
 .../plot/database/SQLManager.java             | 130 ++++++-------
 .../plot/database/StmtMod.java                |   4 +-
 .../plot/flag/AbstractFlag.java               |  34 ++--
 .../plot/flag/FlagValue.java                  |  16 +-
 .../plot/generator/ClassicPlotManager.java    |  26 +--
 .../plot/object/Rating.java                   |   6 +-
 .../plot/object/RegionWrapper.java            |  35 ++--
 .../plot/object/RunnableVal.java              |   2 +-
 .../plot/object/RunnableVal2.java             |   2 +-
 .../plot/util/MainUtil.java                   |  16 +-
 .../plotsquared/general/commands/Command.java |  44 ++---
 .../listener/ProcessedWEExtent.java           |  17 +-
 .../sponge/listener/MainListener.java         |  19 +-
 .../sponge/util/SpongeSchematicHandler.java   |  19 +-
 .../sponge/util/SpongeSetupUtils.java         |  28 ++-
 .../uuid/SpongeLowerOfflineUUIDWrapper.java   |  16 +-
 63 files changed, 950 insertions(+), 1083 deletions(-)

diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java b/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java
index 0a95a61c9..de98b99d5 100644
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java
@@ -123,7 +123,7 @@ public class BukkitMain extends JavaPlugin implements Listener, IPlotMain {
 
     @Override
     public void onEnable() {
-        THIS = this;
+        BukkitMain.THIS = this;
         new PS(this, "Bukkit");
     }
 
@@ -131,12 +131,12 @@ public class BukkitMain extends JavaPlugin implements Listener, IPlotMain {
     public void onDisable() {
         PS.get().disable();
         Bukkit.getScheduler().cancelTasks(this);
-        THIS = null;
+        BukkitMain.THIS = null;
     }
 
     @Override
     public void log(String message) {
-        if (THIS != null) {
+        if (BukkitMain.THIS != null) {
             try {
                 message = C.color(message);
                 if (!Settings.CONSOLE_COLOR) {
@@ -153,7 +153,7 @@ public class BukkitMain extends JavaPlugin implements Listener, IPlotMain {
 
     @Override
     public void disable() {
-        if (THIS != null) {
+        if (BukkitMain.THIS != null) {
             onDisable();
         }
     }
@@ -224,10 +224,9 @@ public class BukkitMain extends JavaPlugin implements Listener, IPlotMain {
                                     case LIGHTNING:
                                     case WITHER_SKULL:
                                     case UNKNOWN:
-                                    case PLAYER: {
+                                    case PLAYER:
                                         // non moving / unmovable
                                         continue;
-                                    }
                                     case THROWN_EXP_BOTTLE:
                                     case SPLASH_POTION:
                                     case SNOWBALL:
@@ -235,15 +234,13 @@ public class BukkitMain extends JavaPlugin implements Listener, IPlotMain {
                                     case SPECTRAL_ARROW:
                                     case TIPPED_ARROW:
                                     case ENDER_PEARL:
-                                    case ARROW: {
+                                    case ARROW:
                                         // managed elsewhere | projectile
                                         continue;
-                                    }
                                     case ARMOR_STAND:
                                     case ITEM_FRAME:
-                                    case PAINTING: {
+                                    case PAINTING:
                                         // TEMPORARILY CLASSIFY AS VEHICLE
-                                    }
                                     case MINECART:
                                     case MINECART_CHEST:
                                     case MINECART_COMMAND:
@@ -278,15 +275,13 @@ public class BukkitMain extends JavaPlugin implements Listener, IPlotMain {
                                     case SMALL_FIREBALL:
                                     case FIREBALL:
                                     case DRAGON_FIREBALL:
-                                    case DROPPED_ITEM: {
+                                    case DROPPED_ITEM:
                                         // dropped item
                                         continue;
-                                    }
                                     case PRIMED_TNT:
-                                    case FALLING_BLOCK: {
+                                    case FALLING_BLOCK:
                                         // managed elsewhere
                                         continue;
-                                    }
                                     case BAT:
                                     case BLAZE:
                                     case CAVE_SPIDER:
@@ -320,7 +315,7 @@ public class BukkitMain extends JavaPlugin implements Listener, IPlotMain {
                                     case WOLF:
                                     case ZOMBIE:
                                     case SHULKER:
-                                    default: {
+                                    default:
                                         if (!Settings.KILL_ROAD_MOBS) {
                                             continue;
                                         }
@@ -332,7 +327,6 @@ public class BukkitMain extends JavaPlugin implements Listener, IPlotMain {
                                                 entity.remove();
                                             }
                                         }
-                                    }
                                 }
                             }
                         } catch (Throwable e) {
@@ -383,7 +377,7 @@ public class BukkitMain extends JavaPlugin implements Listener, IPlotMain {
     @Override
     public boolean initWorldEdit() {
         if (getServer().getPluginManager().getPlugin("WorldEdit") != null) {
-            BukkitMain.worldEdit = (WorldEditPlugin) getServer().getPluginManager().getPlugin("WorldEdit");
+            worldEdit = (WorldEditPlugin) getServer().getPluginManager().getPlugin("WorldEdit");
             getServer().getPluginManager().registerEvents(new WEListener(), this);
             return true;
         }
diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/database/plotme/APlotMeConnector.java b/Bukkit/src/main/java/com/plotsquared/bukkit/database/plotme/APlotMeConnector.java
index 48e5b5d76..f91507157 100644
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/database/plotme/APlotMeConnector.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/database/plotme/APlotMeConnector.java
@@ -55,16 +55,16 @@ abstract class APlotMeConnector {
     public Location getPlotTopLocAbs(int path, int plot, PlotId plotid) {
         int px = plotid.x;
         int pz = plotid.y;
-        int x = (px * (path + plot)) - (int) Math.floor(path / 2) - 1;
-        int z = (pz * (path + plot)) - (int) Math.floor(path / 2) - 1;
+        int x = px * (path + plot) - (int) Math.floor(path / 2) - 1;
+        int z = pz * (path + plot) - (int) Math.floor(path / 2) - 1;
         return new Location(null, x, 256, z);
     }
 
     public Location getPlotBottomLocAbs(int path, int plot, PlotId plotid) {
         int px = plotid.x;
         int pz = plotid.y;
-        int x = (px * (path + plot)) - plot - (int) Math.floor(path / 2) - 1;
-        int z = (pz * (path + plot)) - plot - (int) Math.floor(path / 2) - 1;
+        int x = px * (path + plot) - plot - (int) Math.floor(path / 2) - 1;
+        int z = pz * (path + plot) - plot - (int) Math.floor(path / 2) - 1;
         return new Location(null, x, 1, z);
     }
 
diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/object/entity/EntityWrapper.java b/Bukkit/src/main/java/com/plotsquared/bukkit/object/entity/EntityWrapper.java
index 3dcd84941..157372840 100644
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/object/entity/EntityWrapper.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/object/entity/EntityWrapper.java
@@ -56,7 +56,7 @@ public class EntityWrapper {
     private ArmorStandStats stand;
     
     @SuppressWarnings("deprecation")
-    public EntityWrapper(org.bukkit.entity.Entity entity, short depth) {
+    public EntityWrapper(Entity entity, short depth) {
         this.hash = entity.getEntityId();
         this.depth = depth;
         Location loc = entity.getLocation();
@@ -113,21 +113,24 @@ public class EntityWrapper {
             case THROWN_EXP_BOTTLE:
             case WEATHER:
             case WITHER_SKULL:
-            case UNKNOWN: {
+            case UNKNOWN:
+            case TIPPED_ARROW:
+            case SPECTRAL_ARROW:
+            case SHULKER_BULLET:
+            case DRAGON_FIREBALL:
+            case LINGERING_POTION:
+            case AREA_EFFECT_CLOUD:
                 // Do this stuff later
                 return;
-            }
-            default: {
+            default:
                 PS.debug("&cCOULD NOT IDENTIFY ENTITY: " + entity.getType());
                 return;
-            }
             // MISC //
-            case DROPPED_ITEM: {
+            case DROPPED_ITEM:
                 Item item = (Item) entity;
                 this.stack = item.getItemStack();
                 return;
-            }
-            case ITEM_FRAME: {
+            case ITEM_FRAME:
                 ItemFrame itemframe = (ItemFrame) entity;
                 this.x = Math.floor(this.x);
                 this.y = Math.floor(this.y);
@@ -135,8 +138,7 @@ public class EntityWrapper {
                 this.dataByte = getOrdinal(Rotation.values(), itemframe.getRotation());
                 this.stack = itemframe.getItem().clone();
                 return;
-            }
-            case PAINTING: {
+            case PAINTING:
                 Painting painting = (Painting) entity;
                 this.x = Math.floor(this.x);
                 this.y = Math.floor(this.y);
@@ -144,23 +146,21 @@ public class EntityWrapper {
                 Art a = painting.getArt();
                 this.dataByte = getOrdinal(BlockFace.values(), painting.getFacing());
                 int h = a.getBlockHeight();
-                if ((h % 2) == 0) {
+                if (h % 2 == 0) {
                     this.y -= 1;
                 }
                 this.dataString = a.name();
                 return;
-            }
             // END MISC //
             // INVENTORY HOLDER //
             case MINECART_CHEST:
-            case MINECART_HOPPER: {
+            case MINECART_HOPPER:
                 storeInventory((InventoryHolder) entity);
                 return;
-            }
             // START LIVING ENTITY //
             // START AGEABLE //
             // START TAMEABLE //
-            case HORSE: {
+            case HORSE:
                 Horse horse = (Horse) entity;
                 this.horse = new HorseStats();
                 this.horse.jump = horse.getJumpStrength();
@@ -173,52 +173,45 @@ public class EntityWrapper {
                 storeLiving((LivingEntity) entity);
                 storeInventory((InventoryHolder) entity);
                 return;
-            }
             // END INVENTORY HOLDER //
             case WOLF:
-            case OCELOT: {
+            case OCELOT:
                 storeTameable((Tameable) entity);
                 storeAgeable((Ageable) entity);
                 storeLiving((LivingEntity) entity);
                 return;
-            }
             // END TAMEABLE //
-            case SHEEP: {
+            case SHEEP:
                 Sheep sheep = (Sheep) entity;
                 this.dataByte = (byte) (sheep.isSheared() ? 1 : 0);
                 this.dataByte2 = sheep.getColor().getDyeData();
                 storeAgeable((Ageable) entity);
                 storeLiving((LivingEntity) entity);
                 return;
-            }
             case VILLAGER:
             case CHICKEN:
             case COW:
             case MUSHROOM_COW:
-            case PIG: {
+            case PIG:
                 storeAgeable((Ageable) entity);
                 storeLiving((LivingEntity) entity);
                 return;
-            }
-            // END AGEABLE //
-            case RABBIT: { // NEW
+            case RABBIT:  // NEW
                 this.dataByte = getOrdinal(Type.values(), ((Rabbit) entity).getRabbitType());
                 storeAgeable((Ageable) entity);
                 storeLiving((LivingEntity) entity);
                 return;
-            }
-            case GUARDIAN: { // NEW
+            // END AGEABLE //
+            case GUARDIAN:  // NEW
                 this.dataByte = (byte) (((Guardian) entity).isElder() ? 1 : 0);
                 storeLiving((LivingEntity) entity);
                 return;
-            }
-            case SKELETON: { // NEW
+            case SKELETON:  // NEW
                 this.dataByte = (byte) ((Skeleton) entity).getSkeletonType().getId();
                 storeLiving((LivingEntity) entity);
                 return;
-            }
-            case ARMOR_STAND: { // NEW
-                                // CHECK positions
+            case ARMOR_STAND:  // NEW
+                // CHECK positions
                 ArmorStand stand = (ArmorStand) entity;
                 this.inventory = new ItemStack[]{stand.getItemInHand().clone(), stand.getHelmet().clone(), stand.getChestplate().clone(),
                         stand.getLeggings().clone(), stand.getBoots().clone()};
@@ -271,7 +264,6 @@ public class EntityWrapper {
                     this.stand.small = true;
                 }
                 return;
-            }
             case ENDERMITE: // NEW
             case BAT:
             case ENDER_DRAGON:
@@ -289,12 +281,11 @@ public class EntityWrapper {
             case ENDERMAN:
             case CREEPER:
             case BLAZE:
+            case SHULKER:
             case SNOWMAN:
-            case IRON_GOLEM: {
+            case IRON_GOLEM:
                 storeLiving((LivingEntity) entity);
-                return;
-            }
-            // END LIVING //
+                // END LIVING //
         }
     }
 
@@ -318,7 +309,7 @@ public class EntityWrapper {
             entity.setCustomName(this.lived.name);
             entity.setCustomNameVisible(this.lived.visible);
         }
-        if ((this.lived.potions != null) && !this.lived.potions.isEmpty()) {
+        if (this.lived.potions != null && !this.lived.potions.isEmpty()) {
             entity.addPotionEffects(this.lived.potions);
         }
         entity.setRemainingAir(this.lived.air);
@@ -413,21 +404,17 @@ public class EntityWrapper {
         }
         Entity entity;
         switch (this.type) {
-            case DROPPED_ITEM: {
+            case DROPPED_ITEM:
                 return world.dropItem(loc, this.stack);
-            }
             case PLAYER:
-            case LEASH_HITCH: {
+            case LEASH_HITCH:
                 return null;
-            }
-            case ITEM_FRAME: {
+            case ITEM_FRAME:
                 entity = world.spawn(loc, ItemFrame.class);
                 break;
-            }
-            case PAINTING: {
+            case PAINTING:
                 entity = world.spawn(loc, Painting.class);
                 break;
-            }
             default:
                 entity = world.spawnEntity(loc, this.type);
                 break;
@@ -483,38 +470,33 @@ public class EntityWrapper {
             case WEATHER:
             case WITHER_SKULL:
             case MINECART_FURNACE:
-            case UNKNOWN: {
+            case UNKNOWN:
                 // Do this stuff later
                 return entity;
-            }
-            default: {
+            default:
                 PS.debug("&cCOULD NOT IDENTIFY ENTITY: " + entity.getType());
                 return entity;
-            }
             // MISC //
-            case ITEM_FRAME: {
+            case ITEM_FRAME:
                 ItemFrame itemframe = (ItemFrame) entity;
                 itemframe.setRotation(Rotation.values()[this.dataByte]);
                 itemframe.setItem(this.stack);
                 return entity;
-            }
-            case PAINTING: {
+            case PAINTING:
                 Painting painting = (Painting) entity;
                 painting.setFacingDirection(BlockFace.values()[this.dataByte], true);
                 painting.setArt(Art.getByName(this.dataString), true);
                 return entity;
-            }
             // END MISC //
             // INVENTORY HOLDER //
             case MINECART_CHEST:
-            case MINECART_HOPPER: {
+            case MINECART_HOPPER:
                 restoreInventory((InventoryHolder) entity);
                 return entity;
-            }
             // START LIVING ENTITY //
             // START AGEABLE //
             // START TAMEABLE //
-            case HORSE: {
+            case HORSE:
                 Horse horse = (Horse) entity;
                 horse.setJumpStrength(this.horse.jump);
                 horse.setCarryingChest(this.horse.chest);
@@ -526,17 +508,15 @@ public class EntityWrapper {
                 restoreLiving((LivingEntity) entity);
                 restoreInventory((InventoryHolder) entity);
                 return entity;
-            }
             // END INVENTORY HOLDER //
             case WOLF:
-            case OCELOT: {
+            case OCELOT:
                 restoreTameable((Tameable) entity);
                 restoreAgeable((Ageable) entity);
                 restoreLiving((LivingEntity) entity);
                 return entity;
-            }
             // END AGEABLE //
-            case SHEEP: {
+            case SHEEP:
                 Sheep sheep = (Sheep) entity;
                 if (this.dataByte == 1) {
                     sheep.setSheared(true);
@@ -547,41 +527,36 @@ public class EntityWrapper {
                 restoreAgeable((Ageable) entity);
                 restoreLiving((LivingEntity) entity);
                 return entity;
-            }
             case VILLAGER:
             case CHICKEN:
             case COW:
             case MUSHROOM_COW:
-            case PIG: {
+            case PIG:
                 restoreAgeable((Ageable) entity);
                 restoreLiving((LivingEntity) entity);
                 return entity;
-            }
             // END AGEABLE //
-            case RABBIT: { // NEW
+            case RABBIT:  // NEW
                 if (this.dataByte != 0) {
                     ((Rabbit) entity).setRabbitType(Type.values()[this.dataByte]);
                 }
                 restoreAgeable((Ageable) entity);
                 restoreLiving((LivingEntity) entity);
                 return entity;
-            }
-            case GUARDIAN: { // NEW
+            case GUARDIAN:  // NEW
                 if (this.dataByte != 0) {
                     ((Guardian) entity).setElder(true);
                 }
                 restoreLiving((LivingEntity) entity);
                 return entity;
-            }
-            case SKELETON: { // NEW
+            case SKELETON:  // NEW
                 if (this.dataByte != 0) {
                     ((Skeleton) entity).setSkeletonType(SkeletonType.values()[this.dataByte]);
                 }
                 storeLiving((LivingEntity) entity);
                 return entity;
-            }
-            case ARMOR_STAND: { // NEW
-                                // CHECK positions
+            case ARMOR_STAND:  // NEW
+                // CHECK positions
                 ArmorStand stand = (ArmorStand) entity;
                 if (this.inventory[0] != null) {
                     stand.setItemInHand(this.inventory[0]);
@@ -598,27 +573,27 @@ public class EntityWrapper {
                 if (this.inventory[4] != null) {
                     stand.setBoots(this.inventory[4]);
                 }
-                if ((this.stand.head[0] != 0) || (this.stand.head[1] != 0) || (this.stand.head[2] != 0)) {
+                if (this.stand.head[0] != 0 || this.stand.head[1] != 0 || this.stand.head[2] != 0) {
                     EulerAngle pose = new EulerAngle(this.stand.head[0], this.stand.head[1], this.stand.head[2]);
                     stand.setHeadPose(pose);
                 }
-                if ((this.stand.body[0] != 0) || (this.stand.body[1] != 0) || (this.stand.body[2] != 0)) {
+                if (this.stand.body[0] != 0 || this.stand.body[1] != 0 || this.stand.body[2] != 0) {
                     EulerAngle pose = new EulerAngle(this.stand.body[0], this.stand.body[1], this.stand.body[2]);
                     stand.setBodyPose(pose);
                 }
-                if ((this.stand.leftLeg[0] != 0) || (this.stand.leftLeg[1] != 0) || (this.stand.leftLeg[2] != 0)) {
+                if (this.stand.leftLeg[0] != 0 || this.stand.leftLeg[1] != 0 || this.stand.leftLeg[2] != 0) {
                     EulerAngle pose = new EulerAngle(this.stand.leftLeg[0], this.stand.leftLeg[1], this.stand.leftLeg[2]);
                     stand.setLeftLegPose(pose);
                 }
-                if ((this.stand.rightLeg[0] != 0) || (this.stand.rightLeg[1] != 0) || (this.stand.rightLeg[2] != 0)) {
+                if (this.stand.rightLeg[0] != 0 || this.stand.rightLeg[1] != 0 || this.stand.rightLeg[2] != 0) {
                     EulerAngle pose = new EulerAngle(this.stand.rightLeg[0], this.stand.rightLeg[1], this.stand.rightLeg[2]);
                     stand.setRightLegPose(pose);
                 }
-                if ((this.stand.leftArm[0] != 0) || (this.stand.leftArm[1] != 0) || (this.stand.leftArm[2] != 0)) {
+                if (this.stand.leftArm[0] != 0 || this.stand.leftArm[1] != 0 || this.stand.leftArm[2] != 0) {
                     EulerAngle pose = new EulerAngle(this.stand.leftArm[0], this.stand.leftArm[1], this.stand.leftArm[2]);
                     stand.setLeftArmPose(pose);
                 }
-                if ((this.stand.rightArm[0] != 0) || (this.stand.rightArm[1] != 0) || (this.stand.rightArm[2] != 0)) {
+                if (this.stand.rightArm[0] != 0 || this.stand.rightArm[1] != 0 || this.stand.rightArm[2] != 0) {
                     EulerAngle pose = new EulerAngle(this.stand.rightArm[0], this.stand.rightArm[1], this.stand.rightArm[2]);
                     stand.setRightArmPose(pose);
                 }
@@ -639,7 +614,6 @@ public class EntityWrapper {
                 }
                 restoreLiving((LivingEntity) entity);
                 return entity;
-            }
             case ENDERMITE: // NEW
             case BAT:
             case ENDER_DRAGON:
@@ -658,10 +632,9 @@ public class EntityWrapper {
             case CREEPER:
             case BLAZE:
             case SNOWMAN:
-            case IRON_GOLEM: {
+            case IRON_GOLEM:
                 restoreLiving((LivingEntity) entity);
                 return entity;
-            }
             // END LIVING //
         }
     }
diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitSchematicHandler.java b/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitSchematicHandler.java
index a7b4728a9..e55cee895 100644
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitSchematicHandler.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitSchematicHandler.java
@@ -26,7 +26,6 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Set;
 
 /**
@@ -45,9 +44,9 @@ public class BukkitSchematicHandler extends SchematicHandler {
                 final Location bot = corners[0];
                 Location top = corners[1];
 
-                final int width = (top.getX() - bot.getX()) + 1;
-                int height = (top.getY() - bot.getY()) + 1;
-                final int length = (top.getZ() - bot.getZ()) + 1;
+                final int width = top.getX() - bot.getX() + 1;
+                int height = top.getY() - bot.getY() + 1;
+                final int length = top.getZ() - bot.getZ() + 1;
                 // Main Schematic tag
                 final HashMap<String, Tag> schematic = new HashMap<>();
                 schematic.put("Width", new ShortTag("Width", (short) width));
@@ -114,7 +113,7 @@ public class BukkitSchematicHandler extends SchematicHandler {
                             @Override
                             public void run() {
                                 long start = System.currentTimeMillis();
-                                while (!chunks.isEmpty() && ((System.currentTimeMillis() - start) < 20)) {
+                                while (!chunks.isEmpty() && System.currentTimeMillis() - start < 20) {
                                     // save schematics
                                     ChunkLoc chunk = chunks.remove(0);
                                     Chunk bc = worldObj.getChunkAt(chunk.x, chunk.z);
@@ -145,7 +144,7 @@ public class BukkitSchematicHandler extends SchematicHandler {
                                         int i1 = ry * width * length;
                                         for (int z = zzb; z <= zzt; z++) {
                                             int rz = z - bz;
-                                            int i2 = i1 + (rz * width);
+                                            int i2 = i1 + rz * width;
                                             for (int x = xxb; x <= xxt; x++) {
                                                 int rx = x - bx;
                                                 int index = i2 + rx;
@@ -219,9 +218,8 @@ public class BukkitSchematicHandler extends SchematicHandler {
                                                     case 189:
                                                     case 190:
                                                     case 191:
-                                                    case 192: {
+                                                    case 192:
                                                         break;
-                                                    }
                                                     case 54:
                                                     case 130:
                                                     case 142:
@@ -256,17 +254,14 @@ public class BukkitSchematicHandler extends SchematicHandler {
                                                     case 29:
                                                     case 33:
                                                     case 151:
-                                                    case 178: {
+                                                    case 178:
                                                         // TODO implement fully
                                                         BlockState state = block.getState();
                                                         if (state != null) {
                                                             StateWrapper wrapper = new StateWrapper(state);
                                                             CompoundTag rawTag = wrapper.getTag();
                                                             if (rawTag != null) {
-                                                                Map<String, Tag> values = new HashMap<>();
-                                                                for (Entry<String, Tag> entry : rawTag.getValue().entrySet()) {
-                                                                    values.put(entry.getKey(), entry.getValue());
-                                                                }
+                                                                Map<String, Tag> values = new HashMap<>(rawTag.getValue());
                                                                 values.put("id", new StringTag("id", wrapper.getId()));
                                                                 values.put("x", new IntTag("x", x));
                                                                 values.put("y", new IntTag("y", y));
@@ -275,10 +270,8 @@ public class BukkitSchematicHandler extends SchematicHandler {
                                                                 tileEntities.add(tileEntityTag);
                                                             }
                                                         }
-                                                    }
-                                                    default: {
+                                                    default:
                                                         blockData[index] = block.getData();
-                                                    }
                                                 }
                                                 // For optimization reasons, we are not supporting custom data types
                                                 // Especially since the most likely reason beyond  this range is modded servers in which the blocks
diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitSetupUtils.java b/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitSetupUtils.java
index 209041b06..c9b39552b 100644
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitSetupUtils.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitSetupUtils.java
@@ -75,7 +75,7 @@ public class BukkitSetupUtils extends SetupUtils {
                     options.put("generator.type", object.type);
                     options.put("generator.terrain", object.terrain);
                     options.put("generator.plugin", object.plotManager);
-                    if ((object.setupGenerator != null) && !object.setupGenerator.equals(object.plotManager)) {
+                    if (object.setupGenerator != null && !object.setupGenerator.equals(object.plotManager)) {
                         options.put("generator.init", object.setupGenerator);
                     }
                     for (Entry<String, Object> entry : options.entrySet()) {
@@ -91,34 +91,32 @@ public class BukkitSetupUtils extends SetupUtils {
                         }
                     }
                 }
-                GeneratorWrapper<?> gen = generators.get(object.setupGenerator);
-                if ((gen != null) && gen.isFull()) {
+                GeneratorWrapper<?> gen = SetupUtils.generators.get(object.setupGenerator);
+                if (gen != null && gen.isFull()) {
                     object.setupGenerator = null;
                 }
                 break;
             }
-            case 1: {
+            case 1:
                 for (ConfigurationNode step : steps) {
                     worldSection.set(step.getConstant(), step.getValue());
                 }
                 PS.get().config.set("worlds." + world + "." + "generator.type", object.type);
                 PS.get().config.set("worlds." + world + "." + "generator.terrain", object.terrain);
                 PS.get().config.set("worlds." + world + "." + "generator.plugin", object.plotManager);
-                if ((object.setupGenerator != null) && !object.setupGenerator.equals(object.plotManager)) {
+                if (object.setupGenerator != null && !object.setupGenerator.equals(object.plotManager)) {
                     PS.get().config.set("worlds." + world + "." + "generator.init", object.setupGenerator);
                 }
-                GeneratorWrapper<?> gen = generators.get(object.setupGenerator);
-                if ((gen != null) && gen.isFull()) {
+                GeneratorWrapper<?> gen = SetupUtils.generators.get(object.setupGenerator);
+                if (gen != null && gen.isFull()) {
                     object.setupGenerator = null;
                 }
                 break;
-            }
-            case 0: {
+            case 0:
                 for (ConfigurationNode step : steps) {
                     worldSection.set(step.getConstant(), step.getValue());
                 }
                 break;
-            }
         }
         try {
             PS.get().config.save(PS.get().configFile);
@@ -126,7 +124,7 @@ public class BukkitSetupUtils extends SetupUtils {
             e.printStackTrace();
         }
         if (object.setupGenerator != null) {
-            if ((Bukkit.getPluginManager().getPlugin("Multiverse-Core") != null) && Bukkit.getPluginManager().getPlugin("Multiverse-Core")
+            if (Bukkit.getPluginManager().getPlugin("Multiverse-Core") != null && Bukkit.getPluginManager().getPlugin("Multiverse-Core")
                     .isEnabled()) {
                 Bukkit.getServer()
                         .dispatchCommand(Bukkit.getServer().getConsoleSender(), "mv create " + world + " normal -g " + object.setupGenerator);
@@ -135,7 +133,7 @@ public class BukkitSetupUtils extends SetupUtils {
                     return world;
                 }
             }
-            if ((Bukkit.getPluginManager().getPlugin("MultiWorld") != null) && Bukkit.getPluginManager().getPlugin("MultiWorld").isEnabled()) {
+            if (Bukkit.getPluginManager().getPlugin("MultiWorld") != null && Bukkit.getPluginManager().getPlugin("MultiWorld").isEnabled()) {
                 Bukkit.getServer().dispatchCommand(Bukkit.getServer().getConsoleSender(), "mw create " + world + " plugin:" + object.setupGenerator);
                 setGenerator(world, object.setupGenerator);
                 if (Bukkit.getWorld(world) != null) {
@@ -148,14 +146,14 @@ public class BukkitSetupUtils extends SetupUtils {
             Bukkit.createWorld(wc);
             setGenerator(world, object.setupGenerator);
         } else {
-            if ((Bukkit.getPluginManager().getPlugin("Multiverse-Core") != null) && Bukkit.getPluginManager().getPlugin("Multiverse-Core")
+            if (Bukkit.getPluginManager().getPlugin("Multiverse-Core") != null && Bukkit.getPluginManager().getPlugin("Multiverse-Core")
                     .isEnabled()) {
                 Bukkit.getServer().dispatchCommand(Bukkit.getServer().getConsoleSender(), "mv create " + world + " normal");
                 if (Bukkit.getWorld(world) != null) {
                     return world;
                 }
             }
-            if ((Bukkit.getPluginManager().getPlugin("MultiWorld") != null) && Bukkit.getPluginManager().getPlugin("MultiWorld").isEnabled()) {
+            if (Bukkit.getPluginManager().getPlugin("MultiWorld") != null && Bukkit.getPluginManager().getPlugin("MultiWorld").isEnabled()) {
                 Bukkit.getServer().dispatchCommand(Bukkit.getServer().getConsoleSender(), "mw create " + world);
                 if (Bukkit.getWorld(world) != null) {
                     return world;
@@ -193,7 +191,7 @@ public class BukkitSetupUtils extends SetupUtils {
         if (!(generator instanceof BukkitPlotGenerator)) {
             return null;
         }
-        for (Entry<String, GeneratorWrapper<?>> entry : generators.entrySet()) {
+        for (Entry<String, GeneratorWrapper<?>> entry : SetupUtils.generators.entrySet()) {
             GeneratorWrapper<?> current = entry.getValue();
             if (current.equals(generator)) {
                 return entry.getKey();
diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/util/block/FastQueue_1_8.java b/Bukkit/src/main/java/com/plotsquared/bukkit/util/block/FastQueue_1_8.java
index 0937e0b5e..bd1c21f0e 100644
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/block/FastQueue_1_8.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/block/FastQueue_1_8.java
@@ -59,7 +59,7 @@ public class FastQueue_1_8 extends SlowQueue {
                 int count = 0;
                 ArrayList<Chunk> chunks = new ArrayList<Chunk>();
                 Iterator<Entry<ChunkWrapper, Chunk>> i = FastQueue_1_8.this.toUpdate.entrySet().iterator();
-                while (i.hasNext() && (count < 128)) {
+                while (i.hasNext() && count < 128) {
                     chunks.add(i.next().getValue());
                     i.remove();
                     count++;
@@ -161,7 +161,7 @@ public class FastQueue_1_8 extends SlowQueue {
                     case 29:
                     case 33:
                     case 151:
-                    case 178: {
+                    case 178:
                         Block block = world.getBlockAt(x, y, z);
                         if (block.getData() == newBlock.data) {
                             if (block.getTypeId() != newBlock.id) {
@@ -175,7 +175,6 @@ public class FastQueue_1_8 extends SlowQueue {
                             }
                         }
                         continue;
-                    }
                 }
 
                 // Start data value shortcut
@@ -263,9 +262,8 @@ public class FastQueue_1_8 extends SlowQueue {
                         case 189:
                         case 190:
                         case 191:
-                        case 192: {
+                        case 192:
                             continue;
-                        }
                     }
                     if (block.getData() == newBlock.data) {
                         return;
@@ -311,14 +309,13 @@ public class FastQueue_1_8 extends SlowQueue {
                     case 29:
                     case 33:
                     case 151:
-                    case 178: {
+                    case 178:
                         if (block.getData() == newBlock.data) {
                             block.setTypeId(newBlock.id, false);
                         } else {
                             block.setTypeIdAndData(newBlock.id, newBlock.data, false);
                         }
                         continue;
-                    }
                 }
                 // End blockstate workaround //
 
diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/util/block/FastQueue_1_9.java b/Bukkit/src/main/java/com/plotsquared/bukkit/util/block/FastQueue_1_9.java
index aa3b9b7fe..54f19dbf3 100644
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/block/FastQueue_1_9.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/block/FastQueue_1_9.java
@@ -230,13 +230,12 @@ public class FastQueue_1_9 extends SlowQueue {
                             setType.call(x, y & 15, z, this.air);
                             continue;
                         }
-                        default: {
+                        default:
                             int x = MainUtil.x_loc[j][k];
                             int y = MainUtil.y_loc[j][k];
                             int z = MainUtil.z_loc[j][k];
                             Object iBlock = this.methodGetByCombinedId.call((int) n);
                             setType.call(x, y & 15, z, iBlock);
-                        }
                     }
                 }
                 if (fill) {
diff --git a/Core/src/main/java/com/intellectualcrafters/configuration/file/FileConfiguration.java b/Core/src/main/java/com/intellectualcrafters/configuration/file/FileConfiguration.java
index 62c38512a..ff7fd88c8 100644
--- a/Core/src/main/java/com/intellectualcrafters/configuration/file/FileConfiguration.java
+++ b/Core/src/main/java/com/intellectualcrafters/configuration/file/FileConfiguration.java
@@ -26,7 +26,6 @@ public abstract class FileConfiguration extends MemoryConfiguration {
      * Creates an empty {@link FileConfiguration} with no default values.
      */
     public FileConfiguration() {
-        super();
     }
     
     /**
@@ -35,7 +34,7 @@ public abstract class FileConfiguration extends MemoryConfiguration {
      *
      * @param defaults Default value provider
      */
-    public FileConfiguration(final Configuration defaults) {
+    public FileConfiguration(Configuration defaults) {
         super(defaults);
     }
     
@@ -54,13 +53,13 @@ public abstract class FileConfiguration extends MemoryConfiguration {
      *     any reason.
      * @throws IllegalArgumentException Thrown when file is null.
      */
-    public void save(final File file) throws IOException {
+    public void save(File file) throws IOException {
         if (file == null) {
             throw new NullPointerException("File cannot be null");
         }
         file.getParentFile().mkdirs();
-        
-        final String data = saveToString();
+
+        String data = saveToString();
 
         try (Writer writer = new OutputStreamWriter(new FileOutputStream(file), StandardCharsets.UTF_8)) {
             writer.write(data);
@@ -82,7 +81,7 @@ public abstract class FileConfiguration extends MemoryConfiguration {
      *     any reason.
      * @throws IllegalArgumentException Thrown when file is null.
      */
-    public void save(final String file) throws IOException {
+    public void save(String file) throws IOException {
         if (file == null) {
             throw new NullPointerException("File cannot be null");
         }
@@ -116,12 +115,12 @@ public abstract class FileConfiguration extends MemoryConfiguration {
      *     a valid Configuration.
      * @throws IllegalArgumentException Thrown when file is null.
      */
-    public void load(final File file) throws IOException, InvalidConfigurationException {
+    public void load(File file) throws IOException, InvalidConfigurationException {
         if (file == null) {
             throw new NullPointerException("File cannot be null");
         }
-        
-        final FileInputStream stream = new FileInputStream(file);
+
+        FileInputStream stream = new FileInputStream(file);
         
         load(new InputStreamReader(stream, StandardCharsets.UTF_8));
     }
@@ -139,9 +138,9 @@ public abstract class FileConfiguration extends MemoryConfiguration {
      *      represent a valid Configuration
      * @throws IllegalArgumentException thrown when reader is null
      */
-    public void load(final Reader reader) throws IOException, InvalidConfigurationException {
+    public void load(Reader reader) throws IOException, InvalidConfigurationException {
 
-        final StringBuilder builder = new StringBuilder();
+        StringBuilder builder = new StringBuilder();
 
         try (BufferedReader input = reader instanceof BufferedReader ? (BufferedReader) reader : new BufferedReader(reader)) {
             String line;
@@ -173,7 +172,7 @@ public abstract class FileConfiguration extends MemoryConfiguration {
      *     a valid Configuration.
      * @throws IllegalArgumentException Thrown when file is null.
      */
-    public void load(final String file) throws IOException, InvalidConfigurationException {
+    public void load(String file) throws IOException, InvalidConfigurationException {
         if (file == null) {
             throw new NullPointerException("File cannot be null");
         }
@@ -196,7 +195,7 @@ public abstract class FileConfiguration extends MemoryConfiguration {
      *     invalid.
      * @throws IllegalArgumentException Thrown if contents is null.
      */
-    public abstract void loadFromString(final String contents) throws InvalidConfigurationException;
+    public abstract void loadFromString(String contents) throws InvalidConfigurationException;
     
     /**
      * Compiles the header for this {@link FileConfiguration} and returns the
@@ -212,10 +211,10 @@ public abstract class FileConfiguration extends MemoryConfiguration {
     
     @Override
     public FileConfigurationOptions options() {
-        if (options == null) {
-            options = new FileConfigurationOptions(this);
+        if (this.options == null) {
+            this.options = new FileConfigurationOptions(this);
         }
-        
-        return (FileConfigurationOptions) options;
+
+        return (FileConfigurationOptions) this.options;
     }
 }
diff --git a/Core/src/main/java/com/intellectualcrafters/jnbt/ByteArrayTag.java b/Core/src/main/java/com/intellectualcrafters/jnbt/ByteArrayTag.java
index 48a7ce06c..791380e06 100644
--- a/Core/src/main/java/com/intellectualcrafters/jnbt/ByteArrayTag.java
+++ b/Core/src/main/java/com/intellectualcrafters/jnbt/ByteArrayTag.java
@@ -4,47 +4,47 @@ package com.intellectualcrafters.jnbt;
  * The {@code TAG_Byte_Array} tag.
  */
 public final class ByteArrayTag extends Tag {
+
     private final byte[] value;
-    
+
     /**
      * Creates the tag with an empty name.
      *
      * @param value the value of the tag
      */
-    public ByteArrayTag(final byte[] value) {
-        super();
+    public ByteArrayTag(byte[] value) {
         this.value = value;
     }
-    
+
     /**
      * Creates the tag.
      *
      * @param name  the name of the tag
      * @param value the value of the tag
      */
-    public ByteArrayTag(final String name, final byte[] value) {
+    public ByteArrayTag(String name, byte[] value) {
         super(name);
         this.value = value;
     }
-    
+
     @Override
     public byte[] getValue() {
-        return value;
+        return this.value;
     }
-    
+
     @Override
     public String toString() {
-        final StringBuilder hex = new StringBuilder();
-        for (final byte b : value) {
-            final String hexDigits = Integer.toHexString(b).toUpperCase();
+        StringBuilder hex = new StringBuilder();
+        for (byte b : this.value) {
+            String hexDigits = Integer.toHexString(b).toUpperCase();
             if (hexDigits.length() == 1) {
                 hex.append("0");
             }
             hex.append(hexDigits).append(" ");
         }
-        final String name = getName();
+        String name = getName();
         String append = "";
-        if ((name != null) && !name.equals("")) {
+        if (name != null && !name.equals("")) {
             append = "(\"" + getName() + "\")";
         }
         return "TAG_Byte_Array" + append + ": " + hex;
diff --git a/Core/src/main/java/com/intellectualcrafters/jnbt/ByteTag.java b/Core/src/main/java/com/intellectualcrafters/jnbt/ByteTag.java
index 40dc78046..627fc754d 100644
--- a/Core/src/main/java/com/intellectualcrafters/jnbt/ByteTag.java
+++ b/Core/src/main/java/com/intellectualcrafters/jnbt/ByteTag.java
@@ -4,41 +4,41 @@ package com.intellectualcrafters.jnbt;
  * The {@code TAG_Byte} tag.
  */
 public final class ByteTag extends Tag {
+
     private final byte value;
-    
+
     /**
      * Creates the tag with an empty name.
      *
      * @param value the value of the tag
      */
-    public ByteTag(final byte value) {
-        super();
+    public ByteTag(byte value) {
         this.value = value;
     }
-    
+
     /**
      * Creates the tag.
      *
      * @param name  the name of the tag
      * @param value the value of the tag
      */
-    public ByteTag(final String name, final byte value) {
+    public ByteTag(String name, byte value) {
         super(name);
         this.value = value;
     }
-    
+
     @Override
     public Byte getValue() {
-        return value;
+        return this.value;
     }
-    
+
     @Override
     public String toString() {
-        final String name = getName();
+        String name = getName();
         String append = "";
-        if ((name != null) && !name.equals("")) {
+        if (name != null && !name.equals("")) {
             append = "(\"" + getName() + "\")";
         }
-        return "TAG_Byte" + append + ": " + value;
+        return "TAG_Byte" + append + ": " + this.value;
     }
 }
diff --git a/Core/src/main/java/com/intellectualcrafters/jnbt/CompoundTag.java b/Core/src/main/java/com/intellectualcrafters/jnbt/CompoundTag.java
index ea5547aa2..75c76b1ed 100644
--- a/Core/src/main/java/com/intellectualcrafters/jnbt/CompoundTag.java
+++ b/Core/src/main/java/com/intellectualcrafters/jnbt/CompoundTag.java
@@ -18,7 +18,6 @@ public final class CompoundTag extends Tag {
      * @param value the value of the tag
      */
     public CompoundTag(Map<String, Tag> value) {
-        super();
         this.value = Collections.unmodifiableMap(value);
     }
 
@@ -374,7 +373,7 @@ public final class CompoundTag extends Tag {
     public String toString() {
         String name = getName();
         String append = "";
-        if ((name != null) && !name.equals("")) {
+        if (name != null && !name.equals("")) {
             append = "(\"" + getName() + "\")";
         }
         StringBuilder bldr = new StringBuilder();
diff --git a/Core/src/main/java/com/intellectualcrafters/jnbt/CompoundTagBuilder.java b/Core/src/main/java/com/intellectualcrafters/jnbt/CompoundTagBuilder.java
index 08eef4fc6..69614f05d 100644
--- a/Core/src/main/java/com/intellectualcrafters/jnbt/CompoundTagBuilder.java
+++ b/Core/src/main/java/com/intellectualcrafters/jnbt/CompoundTagBuilder.java
@@ -9,25 +9,26 @@ import java.util.Map;
  * Helps create compound tags.
  */
 public class CompoundTagBuilder {
+
     private final Map<String, Tag> entries;
-    
+
     /**
      * Create a new instance.
      */
     CompoundTagBuilder() {
-        entries = new HashMap<String, Tag>();
+        this.entries = new HashMap<String, Tag>();
     }
-    
+
     /**
      * Create a new instance and use the given map (which will be modified).
      *
      * @param value the value
      */
-    CompoundTagBuilder(final Map<String, Tag> value) {
+    CompoundTagBuilder(Map<String, Tag> value) {
         checkNotNull(value);
-        entries = value;
+        this.entries = value;
     }
-    
+
     /**
      * Create a new builder instance.
      *
@@ -36,7 +37,7 @@ public class CompoundTagBuilder {
     public static CompoundTagBuilder create() {
         return new CompoundTagBuilder();
     }
-    
+
     /**
      * Put the given key and tag into the compound tag.
      *
@@ -45,13 +46,13 @@ public class CompoundTagBuilder {
      *
      * @return this object
      */
-    public CompoundTagBuilder put(final String key, final Tag value) {
+    public CompoundTagBuilder put(String key, Tag value) {
         checkNotNull(key);
         checkNotNull(value);
-        entries.put(key, value);
+        this.entries.put(key, value);
         return this;
     }
-    
+
     /**
      * Put the given key and value into the compound tag as a {@code ByteArrayTag}.
      *
@@ -60,10 +61,10 @@ public class CompoundTagBuilder {
      *
      * @return this object
      */
-    public CompoundTagBuilder putByteArray(final String key, final byte[] value) {
+    public CompoundTagBuilder putByteArray(String key, byte[] value) {
         return put(key, new ByteArrayTag(key, value));
     }
-    
+
     /**
      * Put the given key and value into the compound tag as a {@code ByteTag}.
      *
@@ -72,10 +73,10 @@ public class CompoundTagBuilder {
      *
      * @return this object
      */
-    public CompoundTagBuilder putByte(final String key, final byte value) {
+    public CompoundTagBuilder putByte(String key, byte value) {
         return put(key, new ByteTag(key, value));
     }
-    
+
     /**
      * Put the given key and value into the compound tag as a {@code DoubleTag}.
      *
@@ -84,10 +85,10 @@ public class CompoundTagBuilder {
      *
      * @return this object
      */
-    public CompoundTagBuilder putDouble(final String key, final double value) {
+    public CompoundTagBuilder putDouble(String key, double value) {
         return put(key, new DoubleTag(key, value));
     }
-    
+
     /**
      * Put the given key and value into the compound tag as a {@code FloatTag}.
      *
@@ -96,10 +97,10 @@ public class CompoundTagBuilder {
      *
      * @return this object
      */
-    public CompoundTagBuilder putFloat(final String key, final float value) {
+    public CompoundTagBuilder putFloat(String key, float value) {
         return put(key, new FloatTag(key, value));
     }
-    
+
     /**
      * Put the given key and value into the compound tag as a {@code IntArrayTag}.
      *
@@ -108,10 +109,10 @@ public class CompoundTagBuilder {
      *
      * @return this object
      */
-    public CompoundTagBuilder putIntArray(final String key, final int[] value) {
+    public CompoundTagBuilder putIntArray(String key, int[] value) {
         return put(key, new IntArrayTag(key, value));
     }
-    
+
     /**
      * Put the given key and value into the compound tag as an {@code IntTag}.
      *
@@ -120,10 +121,10 @@ public class CompoundTagBuilder {
      *
      * @return this object
      */
-    public CompoundTagBuilder putInt(final String key, final int value) {
+    public CompoundTagBuilder putInt(String key, int value) {
         return put(key, new IntTag(key, value));
     }
-    
+
     /**
      * Put the given key and value into the compound tag as a {@code LongTag}.
      *
@@ -132,10 +133,10 @@ public class CompoundTagBuilder {
      *
      * @return this object
      */
-    public CompoundTagBuilder putLong(final String key, final long value) {
+    public CompoundTagBuilder putLong(String key, long value) {
         return put(key, new LongTag(key, value));
     }
-    
+
     /**
      * Put the given key and value into the compound tag as a {@code ShortTag}.
      *
@@ -144,10 +145,10 @@ public class CompoundTagBuilder {
      *
      * @return this object
      */
-    public CompoundTagBuilder putShort(final String key, final short value) {
+    public CompoundTagBuilder putShort(String key, short value) {
         return put(key, new ShortTag(key, value));
     }
-    
+
     /**
      * Put the given key and value into the compound tag as a {@code StringTag}.
      *
@@ -156,10 +157,10 @@ public class CompoundTagBuilder {
      *
      * @return this object
      */
-    public CompoundTagBuilder putString(final String key, final String value) {
+    public CompoundTagBuilder putString(String key, String value) {
         return put(key, new StringTag(key, value));
     }
-    
+
     /**
      * Put all the entries from the given map into this map.
      *
@@ -167,23 +168,23 @@ public class CompoundTagBuilder {
      *
      * @return this object
      */
-    public CompoundTagBuilder putAll(final Map<String, ? extends Tag> value) {
+    public CompoundTagBuilder putAll(Map<String, ? extends Tag> value) {
         checkNotNull(value);
-        for (final Map.Entry<String, ? extends Tag> entry : value.entrySet()) {
+        for (Map.Entry<String, ? extends Tag> entry : value.entrySet()) {
             put(entry.getKey(), entry.getValue());
         }
         return this;
     }
-    
+
     /**
      * Build an unnamed compound tag with this builder's entries.
      *
      * @return the new compound tag
      */
     public CompoundTag build() {
-        return new CompoundTag(new HashMap<String, Tag>(entries));
+        return new CompoundTag(new HashMap<String, Tag>(this.entries));
     }
-    
+
     /**
      * Build a new compound tag with this builder's entries.
      *
@@ -191,7 +192,7 @@ public class CompoundTagBuilder {
      *
      * @return the created compound tag
      */
-    public CompoundTag build(final String name) {
-        return new CompoundTag(name, new HashMap<String, Tag>(entries));
+    public CompoundTag build(String name) {
+        return new CompoundTag(name, new HashMap<String, Tag>(this.entries));
     }
 }
diff --git a/Core/src/main/java/com/intellectualcrafters/jnbt/DoubleTag.java b/Core/src/main/java/com/intellectualcrafters/jnbt/DoubleTag.java
index 7c6a577b7..891f3c0ed 100644
--- a/Core/src/main/java/com/intellectualcrafters/jnbt/DoubleTag.java
+++ b/Core/src/main/java/com/intellectualcrafters/jnbt/DoubleTag.java
@@ -4,41 +4,41 @@ package com.intellectualcrafters.jnbt;
  * The {@code TAG_Double} tag.
  */
 public final class DoubleTag extends Tag {
+
     private final double value;
-    
+
     /**
      * Creates the tag with an empty name.
      *
      * @param value the value of the tag
      */
-    public DoubleTag(final double value) {
-        super();
+    public DoubleTag(double value) {
         this.value = value;
     }
-    
+
     /**
      * Creates the tag.
      *
      * @param name  the name of the tag
      * @param value the value of the tag
      */
-    public DoubleTag(final String name, final double value) {
+    public DoubleTag(String name, double value) {
         super(name);
         this.value = value;
     }
-    
+
     @Override
     public Double getValue() {
-        return value;
+        return this.value;
     }
-    
+
     @Override
     public String toString() {
-        final String name = getName();
+        String name = getName();
         String append = "";
-        if ((name != null) && !name.equals("")) {
+        if (name != null && !name.equals("")) {
             append = "(\"" + getName() + "\")";
         }
-        return "TAG_Double" + append + ": " + value;
+        return "TAG_Double" + append + ": " + this.value;
     }
 }
diff --git a/Core/src/main/java/com/intellectualcrafters/jnbt/EndTag.java b/Core/src/main/java/com/intellectualcrafters/jnbt/EndTag.java
index 981925184..d22efc989 100644
--- a/Core/src/main/java/com/intellectualcrafters/jnbt/EndTag.java
+++ b/Core/src/main/java/com/intellectualcrafters/jnbt/EndTag.java
@@ -4,18 +4,18 @@ package com.intellectualcrafters.jnbt;
  * The {@code TAG_End} tag.
  */
 public final class EndTag extends Tag {
+
     /**
      * Creates the tag.
      */
     public EndTag() {
-        super();
     }
-    
+
     @Override
     public Object getValue() {
         return null;
     }
-    
+
     @Override
     public String toString() {
         return "TAG_End";
diff --git a/Core/src/main/java/com/intellectualcrafters/jnbt/FloatTag.java b/Core/src/main/java/com/intellectualcrafters/jnbt/FloatTag.java
index ae223ca57..2f17aff0d 100644
--- a/Core/src/main/java/com/intellectualcrafters/jnbt/FloatTag.java
+++ b/Core/src/main/java/com/intellectualcrafters/jnbt/FloatTag.java
@@ -4,41 +4,41 @@ package com.intellectualcrafters.jnbt;
  * The {@code TAG_Float} tag.
  */
 public final class FloatTag extends Tag {
+
     private final float value;
-    
+
     /**
      * Creates the tag with an empty name.
      *
      * @param value the value of the tag
      */
-    public FloatTag(final float value) {
-        super();
+    public FloatTag(float value) {
         this.value = value;
     }
-    
+
     /**
      * Creates the tag.
      *
      * @param name  the name of the tag
      * @param value the value of the tag
      */
-    public FloatTag(final String name, final float value) {
+    public FloatTag(String name, float value) {
         super(name);
         this.value = value;
     }
-    
+
     @Override
     public Float getValue() {
-        return value;
+        return this.value;
     }
-    
+
     @Override
     public String toString() {
-        final String name = getName();
+        String name = getName();
         String append = "";
-        if ((name != null) && !name.equals("")) {
+        if (name != null && !name.equals("")) {
             append = "(\"" + getName() + "\")";
         }
-        return "TAG_Float" + append + ": " + value;
+        return "TAG_Float" + append + ": " + this.value;
     }
 }
diff --git a/Core/src/main/java/com/intellectualcrafters/jnbt/IntArrayTag.java b/Core/src/main/java/com/intellectualcrafters/jnbt/IntArrayTag.java
index 5a30bd41c..5a53adffb 100644
--- a/Core/src/main/java/com/intellectualcrafters/jnbt/IntArrayTag.java
+++ b/Core/src/main/java/com/intellectualcrafters/jnbt/IntArrayTag.java
@@ -6,49 +6,49 @@ import static com.google.common.base.Preconditions.checkNotNull;
  * The {@code TAG_Int_Array} tag.
  */
 public final class IntArrayTag extends Tag {
+
     private final int[] value;
-    
+
     /**
      * Creates the tag with an empty name.
      *
      * @param value the value of the tag
      */
-    public IntArrayTag(final int[] value) {
-        super();
+    public IntArrayTag(int[] value) {
         checkNotNull(value);
         this.value = value;
     }
-    
+
     /**
      * Creates the tag.
      *
      * @param name  the name of the tag
      * @param value the value of the tag
      */
-    public IntArrayTag(final String name, final int[] value) {
+    public IntArrayTag(String name, int[] value) {
         super(name);
         checkNotNull(value);
         this.value = value;
     }
-    
+
     @Override
     public int[] getValue() {
-        return value;
+        return this.value;
     }
-    
+
     @Override
     public String toString() {
-        final StringBuilder hex = new StringBuilder();
-        for (final int b : value) {
-            final String hexDigits = Integer.toHexString(b).toUpperCase();
+        StringBuilder hex = new StringBuilder();
+        for (int b : this.value) {
+            String hexDigits = Integer.toHexString(b).toUpperCase();
             if (hexDigits.length() == 1) {
                 hex.append("0");
             }
             hex.append(hexDigits).append(" ");
         }
-        final String name = getName();
+        String name = getName();
         String append = "";
-        if ((name != null) && !name.equals("")) {
+        if (name != null && !name.equals("")) {
             append = "(\"" + getName() + "\")";
         }
         return "TAG_Int_Array" + append + ": " + hex;
diff --git a/Core/src/main/java/com/intellectualcrafters/jnbt/IntTag.java b/Core/src/main/java/com/intellectualcrafters/jnbt/IntTag.java
index 16f3487a9..349c0d57b 100644
--- a/Core/src/main/java/com/intellectualcrafters/jnbt/IntTag.java
+++ b/Core/src/main/java/com/intellectualcrafters/jnbt/IntTag.java
@@ -4,41 +4,41 @@ package com.intellectualcrafters.jnbt;
  * The {@code TAG_Int} tag.
  */
 public final class IntTag extends Tag {
+
     private final int value;
-    
+
     /**
      * Creates the tag with an empty name.
      *
      * @param value the value of the tag
      */
-    public IntTag(final int value) {
-        super();
+    public IntTag(int value) {
         this.value = value;
     }
-    
+
     /**
      * Creates the tag.
      *
      * @param name  the name of the tag
      * @param value the value of the tag
      */
-    public IntTag(final String name, final int value) {
+    public IntTag(String name, int value) {
         super(name);
         this.value = value;
     }
-    
+
     @Override
     public Integer getValue() {
-        return value;
+        return this.value;
     }
-    
+
     @Override
     public String toString() {
-        final String name = getName();
+        String name = getName();
         String append = "";
-        if ((name != null) && !name.equals("")) {
+        if (name != null && !name.equals("")) {
             append = "(\"" + getName() + "\")";
         }
-        return "TAG_Int" + append + ": " + value;
+        return "TAG_Int" + append + ": " + this.value;
     }
 }
diff --git a/Core/src/main/java/com/intellectualcrafters/jnbt/ListTag.java b/Core/src/main/java/com/intellectualcrafters/jnbt/ListTag.java
index d19fb0634..8eda20d3c 100644
--- a/Core/src/main/java/com/intellectualcrafters/jnbt/ListTag.java
+++ b/Core/src/main/java/com/intellectualcrafters/jnbt/ListTag.java
@@ -10,22 +10,22 @@ import java.util.NoSuchElementException;
  * The {@code TAG_List} tag.
  */
 public final class ListTag extends Tag {
+
     private final Class<? extends Tag> type;
     private final List<Tag> value;
-    
+
     /**
      * Creates the tag with an empty name.
      *
      * @param type  the type of tag
      * @param value the value of the tag
      */
-    public ListTag(final Class<? extends Tag> type, final List<? extends Tag> value) {
-        super();
+    public ListTag(Class<? extends Tag> type, List<? extends Tag> value) {
         checkNotNull(value);
         this.type = type;
         this.value = Collections.unmodifiableList(value);
     }
-    
+
     /**
      * Creates the tag.
      *
@@ -33,27 +33,27 @@ public final class ListTag extends Tag {
      * @param type  the type of tag
      * @param value the value of the tag
      */
-    public ListTag(final String name, final Class<? extends Tag> type, final List<? extends Tag> value) {
+    public ListTag(String name, Class<? extends Tag> type, List<? extends Tag> value) {
         super(name);
         checkNotNull(value);
         this.type = type;
         this.value = Collections.unmodifiableList(value);
     }
-    
+
     /**
      * Gets the type of item in this list.
      *
      * @return The type of item in this list.
      */
     public Class<? extends Tag> getType() {
-        return type;
+        return this.type;
     }
-    
+
     @Override
     public List<Tag> getValue() {
-        return value;
+        return this.value;
     }
-    
+
     /**
      * Create a new list tag with this tag's name and type.
      *
@@ -61,10 +61,10 @@ public final class ListTag extends Tag {
      *
      * @return a new list tag
      */
-    public ListTag setValue(final List<Tag> list) {
+    public ListTag setValue(List<Tag> list) {
         return new ListTag(getName(), getType(), list);
     }
-    
+
     /**
      * Get the tag if it exists at the given index.
      *
@@ -72,14 +72,14 @@ public final class ListTag extends Tag {
      *
      * @return the tag or null
      */
-    public Tag getIfExists(final int index) {
+    public Tag getIfExists(int index) {
         try {
-            return value.get(index);
-        } catch (final NoSuchElementException e) {
+            return this.value.get(index);
+        } catch (NoSuchElementException e) {
             return null;
         }
     }
-    
+
     /**
      * Get a byte array named with the given index.  <p> If the index does not exist or its value is not a byte
      * array tag, then an empty byte array will be returned. </p>
@@ -88,15 +88,15 @@ public final class ListTag extends Tag {
      *
      * @return a byte array
      */
-    public byte[] getByteArray(final int index) {
-        final Tag tag = getIfExists(index);
+    public byte[] getByteArray(int index) {
+        Tag tag = getIfExists(index);
         if (tag instanceof ByteArrayTag) {
             return ((ByteArrayTag) tag).getValue();
         } else {
             return new byte[0];
         }
     }
-    
+
     /**
      * Get a byte named with the given index.  <p> If the index does not exist or its value is not a byte tag, then
      * {@code 0} will be returned. </p>
@@ -105,15 +105,15 @@ public final class ListTag extends Tag {
      *
      * @return a byte
      */
-    public byte getByte(final int index) {
-        final Tag tag = getIfExists(index);
+    public byte getByte(int index) {
+        Tag tag = getIfExists(index);
         if (tag instanceof ByteTag) {
             return ((ByteTag) tag).getValue();
         } else {
             return (byte) 0;
         }
     }
-    
+
     /**
      * Get a double named with the given index.  <p> If the index does not exist or its value is not a double tag,
      * then {@code 0} will be returned. </p>
@@ -122,15 +122,15 @@ public final class ListTag extends Tag {
      *
      * @return a double
      */
-    public double getDouble(final int index) {
-        final Tag tag = getIfExists(index);
+    public double getDouble(int index) {
+        Tag tag = getIfExists(index);
         if (tag instanceof DoubleTag) {
             return ((DoubleTag) tag).getValue();
         } else {
             return 0;
         }
     }
-    
+
     /**
      * Get a double named with the given index, even if it's another type of number.  <p> If the index does not
      * exist or its value is not a number, then {@code 0} will be returned. </p>
@@ -139,8 +139,8 @@ public final class ListTag extends Tag {
      *
      * @return a double
      */
-    public double asDouble(final int index) {
-        final Tag tag = getIfExists(index);
+    public double asDouble(int index) {
+        Tag tag = getIfExists(index);
         if (tag instanceof ByteTag) {
             return ((ByteTag) tag).getValue();
         } else if (tag instanceof ShortTag) {
@@ -157,7 +157,7 @@ public final class ListTag extends Tag {
             return 0;
         }
     }
-    
+
     /**
      * Get a float named with the given index.  <p> If the index does not exist or its value is not a float tag,
      * then {@code 0} will be returned. </p>
@@ -166,15 +166,15 @@ public final class ListTag extends Tag {
      *
      * @return a float
      */
-    public float getFloat(final int index) {
-        final Tag tag = getIfExists(index);
+    public float getFloat(int index) {
+        Tag tag = getIfExists(index);
         if (tag instanceof FloatTag) {
             return ((FloatTag) tag).getValue();
         } else {
             return 0;
         }
     }
-    
+
     /**
      * Get a {@code int[]} named with the given index.  <p> If the index does not exist or its value is not an int
      * array tag, then an empty array will be returned. </p>
@@ -183,15 +183,15 @@ public final class ListTag extends Tag {
      *
      * @return an int array
      */
-    public int[] getIntArray(final int index) {
-        final Tag tag = getIfExists(index);
+    public int[] getIntArray(int index) {
+        Tag tag = getIfExists(index);
         if (tag instanceof IntArrayTag) {
             return ((IntArrayTag) tag).getValue();
         } else {
             return new int[0];
         }
     }
-    
+
     /**
      * Get an int named with the given index.  <p> If the index does not exist or its value is not an int tag, then
      * {@code 0} will be returned. </p>
@@ -200,15 +200,15 @@ public final class ListTag extends Tag {
      *
      * @return an int
      */
-    public int getInt(final int index) {
-        final Tag tag = getIfExists(index);
+    public int getInt(int index) {
+        Tag tag = getIfExists(index);
         if (tag instanceof IntTag) {
             return ((IntTag) tag).getValue();
         } else {
             return 0;
         }
     }
-    
+
     /**
      * Get an int named with the given index, even if it's another type of number.  <p> If the index does not exist
      * or its value is not a number, then {@code 0} will be returned. </p>
@@ -217,8 +217,8 @@ public final class ListTag extends Tag {
      *
      * @return an int
      */
-    public int asInt(final int index) {
-        final Tag tag = getIfExists(index);
+    public int asInt(int index) {
+        Tag tag = getIfExists(index);
         if (tag instanceof ByteTag) {
             return ((ByteTag) tag).getValue();
         } else if (tag instanceof ShortTag) {
@@ -235,7 +235,7 @@ public final class ListTag extends Tag {
             return 0;
         }
     }
-    
+
     /**
      * Get a list of tags named with the given index.  <p> If the index does not exist or its value is not a list
      * tag, then an empty list will be returned. </p>
@@ -244,15 +244,15 @@ public final class ListTag extends Tag {
      *
      * @return a list of tags
      */
-    public List<Tag> getList(final int index) {
-        final Tag tag = getIfExists(index);
+    public List<Tag> getList(int index) {
+        Tag tag = getIfExists(index);
         if (tag instanceof ListTag) {
             return ((ListTag) tag).getValue();
         } else {
             return Collections.emptyList();
         }
     }
-    
+
     /**
      * Get a {@code TagList} named with the given index.  <p> If the index does not exist or its value is not a list
      * tag, then an empty tag list will be returned. </p>
@@ -261,15 +261,15 @@ public final class ListTag extends Tag {
      *
      * @return a tag list instance
      */
-    public ListTag getListTag(final int index) {
-        final Tag tag = getIfExists(index);
+    public ListTag getListTag(int index) {
+        Tag tag = getIfExists(index);
         if (tag instanceof ListTag) {
             return (ListTag) tag;
         } else {
-            return new ListTag(StringTag.class, Collections.<Tag> emptyList());
+            return new ListTag(StringTag.class, Collections.<Tag>emptyList());
         }
     }
-    
+
     /**
      * Get a list of tags named with the given index.  <p> If the index does not exist or its value is not a list
      * tag, then an empty list will be returned. If the given index references a list but the list of of a different
@@ -282,10 +282,10 @@ public final class ListTag extends Tag {
      * @return a list of tags
      */
     @SuppressWarnings("unchecked")
-    public <T extends Tag> List<T> getList(final int index, final Class<T> listType) {
-        final Tag tag = getIfExists(index);
+    public <T extends Tag> List<T> getList(int index, Class<T> listType) {
+        Tag tag = getIfExists(index);
         if (tag instanceof ListTag) {
-            final ListTag listTag = (ListTag) tag;
+            ListTag listTag = (ListTag) tag;
             if (listTag.getType().equals(listType)) {
                 return (List<T>) listTag.getValue();
             } else {
@@ -295,7 +295,7 @@ public final class ListTag extends Tag {
             return Collections.emptyList();
         }
     }
-    
+
     /**
      * Get a long named with the given index.  <p> If the index does not exist or its value is not a long tag, then
      * {@code 0} will be returned. </p>
@@ -304,15 +304,15 @@ public final class ListTag extends Tag {
      *
      * @return a long
      */
-    public long getLong(final int index) {
-        final Tag tag = getIfExists(index);
+    public long getLong(int index) {
+        Tag tag = getIfExists(index);
         if (tag instanceof LongTag) {
             return ((LongTag) tag).getValue();
         } else {
             return 0L;
         }
     }
-    
+
     /**
      * Get a long named with the given index, even if it's another type of number.  <p> If the index does not exist
      * or its value is not a number, then {@code 0} will be returned. </p>
@@ -321,8 +321,8 @@ public final class ListTag extends Tag {
      *
      * @return a long
      */
-    public long asLong(final int index) {
-        final Tag tag = getIfExists(index);
+    public long asLong(int index) {
+        Tag tag = getIfExists(index);
         if (tag instanceof ByteTag) {
             return ((ByteTag) tag).getValue();
         } else if (tag instanceof ShortTag) {
@@ -339,7 +339,7 @@ public final class ListTag extends Tag {
             return 0;
         }
     }
-    
+
     /**
      * Get a short named with the given index.  <p> If the index does not exist or its value is not a short tag,
      * then {@code 0} will be returned. </p>
@@ -348,15 +348,15 @@ public final class ListTag extends Tag {
      *
      * @return a short
      */
-    public short getShort(final int index) {
-        final Tag tag = getIfExists(index);
+    public short getShort(int index) {
+        Tag tag = getIfExists(index);
         if (tag instanceof ShortTag) {
             return ((ShortTag) tag).getValue();
         } else {
             return 0;
         }
     }
-    
+
     /**
      * Get a string named with the given index.  <p> If the index does not exist or its value is not a string tag,
      * then {@code ""} will be returned. </p>
@@ -365,25 +365,27 @@ public final class ListTag extends Tag {
      *
      * @return a string
      */
-    public String getString(final int index) {
-        final Tag tag = getIfExists(index);
+    public String getString(int index) {
+        Tag tag = getIfExists(index);
         if (tag instanceof StringTag) {
             return ((StringTag) tag).getValue();
         } else {
             return "";
         }
     }
-    
+
     @Override
     public String toString() {
-        final String name = getName();
+        String name = getName();
         String append = "";
-        if ((name != null) && !name.equals("")) {
+        if (name != null && !name.equals("")) {
             append = "(\"" + getName() + "\")";
         }
-        final StringBuilder bldr = new StringBuilder();
-        bldr.append("TAG_List").append(append).append(": ").append(value.size()).append(" entries of type ").append(NBTUtils.getTypeName(type)).append("\r\n{\r\n");
-        for (final Tag t : value) {
+        StringBuilder bldr = new StringBuilder();
+        bldr.append("TAG_List").append(append).append(": ").append(this.value.size()).append(" entries of type ")
+                .append(NBTUtils.getTypeName(this.type))
+                .append("\r\n{\r\n");
+        for (Tag t : this.value) {
             bldr.append("   ").append(t.toString().replaceAll("\r\n", "\r\n   ")).append("\r\n");
         }
         bldr.append("}");
diff --git a/Core/src/main/java/com/intellectualcrafters/jnbt/ListTagBuilder.java b/Core/src/main/java/com/intellectualcrafters/jnbt/ListTagBuilder.java
index d9dd65b14..32a95d355 100644
--- a/Core/src/main/java/com/intellectualcrafters/jnbt/ListTagBuilder.java
+++ b/Core/src/main/java/com/intellectualcrafters/jnbt/ListTagBuilder.java
@@ -11,20 +11,21 @@ import java.util.List;
  * Helps create list tags.
  */
 public class ListTagBuilder {
+
     private final Class<? extends Tag> type;
     private final List<Tag> entries;
-    
+
     /**
      * Create a new instance.
      *
      * @param type of tag contained in this list
      */
-    ListTagBuilder(final Class<? extends Tag> type) {
+    ListTagBuilder(Class<? extends Tag> type) {
         checkNotNull(type);
         this.type = type;
-        entries = new ArrayList<Tag>();
+        this.entries = new ArrayList<Tag>();
     }
-    
+
     /**
      * Create a new builder instance.
      *
@@ -32,10 +33,10 @@ public class ListTagBuilder {
      *
      * @return a new builder
      */
-    public static ListTagBuilder create(final Class<? extends Tag> type) {
+    public static ListTagBuilder create(Class<? extends Tag> type) {
         return new ListTagBuilder(type);
     }
-    
+
     /**
      * Create a new builder instance.
      *
@@ -45,22 +46,22 @@ public class ListTagBuilder {
      * @return a new builder
      */
     @SafeVarargs
-    public static <T extends Tag> ListTagBuilder createWith(final T... entries) {
+    public static <T extends Tag> ListTagBuilder createWith(T... entries) {
         checkNotNull(entries);
         if (entries.length == 0) {
             throw new IllegalArgumentException("This method needs an array of at least one entry");
         }
-        final Class<? extends Tag> type = entries[0].getClass();
+        Class<? extends Tag> type = entries[0].getClass();
         for (int i = 1; i < entries.length; i++) {
             if (!type.isInstance(entries[i])) {
                 throw new IllegalArgumentException("An array of different tag types was provided");
             }
         }
-        final ListTagBuilder builder = new ListTagBuilder(type);
+        ListTagBuilder builder = new ListTagBuilder(type);
         builder.addAll(Arrays.asList(entries));
         return builder;
     }
-    
+
     /**
      * Add the given tag.
      *
@@ -68,15 +69,15 @@ public class ListTagBuilder {
      *
      * @return this object
      */
-    public ListTagBuilder add(final Tag value) {
+    public ListTagBuilder add(Tag value) {
         checkNotNull(value);
-        if (!type.isInstance(value)) {
-            throw new IllegalArgumentException(value.getClass().getCanonicalName() + " is not of expected type " + type.getCanonicalName());
+        if (!this.type.isInstance(value)) {
+            throw new IllegalArgumentException(value.getClass().getCanonicalName() + " is not of expected type " + this.type.getCanonicalName());
         }
-        entries.add(value);
+        this.entries.add(value);
         return this;
     }
-    
+
     /**
      * Add all the tags in the given list.
      *
@@ -84,23 +85,23 @@ public class ListTagBuilder {
      *
      * @return this object
      */
-    public ListTagBuilder addAll(final Collection<? extends Tag> value) {
+    public ListTagBuilder addAll(Collection<? extends Tag> value) {
         checkNotNull(value);
-        for (final Tag v : value) {
+        for (Tag v : value) {
             add(v);
         }
         return this;
     }
-    
+
     /**
      * Build an unnamed list tag with this builder's entries.
      *
      * @return the new list tag
      */
     public ListTag build() {
-        return new ListTag(type, new ArrayList<Tag>(entries));
+        return new ListTag(this.type, new ArrayList<Tag>(this.entries));
     }
-    
+
     /**
      * Build a new list tag with this builder's entries.
      *
@@ -108,7 +109,7 @@ public class ListTagBuilder {
      *
      * @return the created list tag
      */
-    public ListTag build(final String name) {
-        return new ListTag(name, type, new ArrayList<Tag>(entries));
+    public ListTag build(String name) {
+        return new ListTag(name, this.type, new ArrayList<Tag>(this.entries));
     }
 }
diff --git a/Core/src/main/java/com/intellectualcrafters/jnbt/LongTag.java b/Core/src/main/java/com/intellectualcrafters/jnbt/LongTag.java
index 274e9448b..ce91cc0ef 100644
--- a/Core/src/main/java/com/intellectualcrafters/jnbt/LongTag.java
+++ b/Core/src/main/java/com/intellectualcrafters/jnbt/LongTag.java
@@ -4,41 +4,41 @@ package com.intellectualcrafters.jnbt;
  * The {@code TAG_Long} tag.
  */
 public final class LongTag extends Tag {
+
     private final long value;
-    
+
     /**
      * Creates the tag with an empty name.
      *
      * @param value the value of the tag
      */
-    public LongTag(final long value) {
-        super();
+    public LongTag(long value) {
         this.value = value;
     }
-    
+
     /**
      * Creates the tag.
      *
      * @param name  the name of the tag
      * @param value the value of the tag
      */
-    public LongTag(final String name, final long value) {
+    public LongTag(String name, long value) {
         super(name);
         this.value = value;
     }
-    
+
     @Override
     public Long getValue() {
-        return value;
+        return this.value;
     }
-    
+
     @Override
     public String toString() {
-        final String name = getName();
+        String name = getName();
         String append = "";
-        if ((name != null) && !name.equals("")) {
+        if (name != null && !name.equals("")) {
             append = "(\"" + getName() + "\")";
         }
-        return "TAG_Long" + append + ": " + value;
+        return "TAG_Long" + append + ": " + this.value;
     }
 }
diff --git a/Core/src/main/java/com/intellectualcrafters/jnbt/NBTConstants.java b/Core/src/main/java/com/intellectualcrafters/jnbt/NBTConstants.java
index f325c160c..add5b7498 100644
--- a/Core/src/main/java/com/intellectualcrafters/jnbt/NBTConstants.java
+++ b/Core/src/main/java/com/intellectualcrafters/jnbt/NBTConstants.java
@@ -9,14 +9,16 @@ import java.nio.charset.StandardCharsets;
 public final class NBTConstants {
 
     public static final Charset CHARSET = StandardCharsets.UTF_8;
-    public static final int TYPE_END = 0, TYPE_BYTE = 1, TYPE_SHORT = 2, TYPE_INT = 3, TYPE_LONG = 4, TYPE_FLOAT = 5, TYPE_DOUBLE = 6, TYPE_BYTE_ARRAY = 7, TYPE_STRING = 8, TYPE_LIST = 9,
-    TYPE_COMPOUND = 10, TYPE_INT_ARRAY = 11;
-    
+    public static final int TYPE_END = 0, TYPE_BYTE = 1, TYPE_SHORT = 2, TYPE_INT = 3, TYPE_LONG = 4, TYPE_FLOAT = 5, TYPE_DOUBLE = 6,
+            TYPE_BYTE_ARRAY = 7, TYPE_STRING = 8, TYPE_LIST = 9,
+            TYPE_COMPOUND = 10, TYPE_INT_ARRAY = 11;
+
     /**
      * Default private constructor.
      */
-    private NBTConstants() {}
-    
+    private NBTConstants() {
+    }
+
     /**
      * Convert a type ID to its corresponding {@link Tag} class.
      *
@@ -26,7 +28,7 @@ public final class NBTConstants {
      *
      * @throws IllegalArgumentException thrown if the tag ID is not valid
      */
-    public static Class<? extends Tag> getClassFromType(final int id) {
+    public static Class<? extends Tag> getClassFromType(int id) {
         switch (id) {
             case TYPE_END:
                 return EndTag.class;
diff --git a/Core/src/main/java/com/intellectualcrafters/jnbt/NBTInputStream.java b/Core/src/main/java/com/intellectualcrafters/jnbt/NBTInputStream.java
index ca75e3204..61bd3088c 100644
--- a/Core/src/main/java/com/intellectualcrafters/jnbt/NBTInputStream.java
+++ b/Core/src/main/java/com/intellectualcrafters/jnbt/NBTInputStream.java
@@ -15,10 +15,11 @@ import java.util.Map;
  * may be found at @linktourl http://www.minecraft.net/docs/NBT.txt"> http://www.minecraft.net/docs/NBT.txt.
  */
 public final class NBTInputStream implements Closeable {
+
     private final DataInputStream is;
-    
+
     private int count;
-    
+
     /**
      * Creates a new {@code NBTInputStream}, which will source its data from the specified input stream.
      *
@@ -26,10 +27,10 @@ public final class NBTInputStream implements Closeable {
      *
      * @throws IOException if an I/O error occurs
      */
-    public NBTInputStream(final InputStream is) {
+    public NBTInputStream(InputStream is) {
         this.is = new DataInputStream(is);
     }
-    
+
     /**
      * Reads an NBT tag from the stream.
      *
@@ -40,7 +41,7 @@ public final class NBTInputStream implements Closeable {
     public Tag readTag() throws IOException {
         return readTag(0, Integer.MAX_VALUE);
     }
-    
+
     /**
      * Reads an NBT tag from the stream.
      *
@@ -48,10 +49,10 @@ public final class NBTInputStream implements Closeable {
      *
      * @throws IOException if an I/O error occurs.
      */
-    public Tag readTag(final int maxDepth) throws IOException {
+    public Tag readTag(int maxDepth) throws IOException {
         return readTag(0, maxDepth);
     }
-    
+
     /**
      * Reads an NBT from the stream.
      *
@@ -61,23 +62,23 @@ public final class NBTInputStream implements Closeable {
      *
      * @throws IOException if an I/O error occurs.
      */
-    private Tag readTag(final int depth, final int maxDepth) throws IOException {
-        if ((count++) > maxDepth) {
-            throw new IOException("Exceeds max depth: " + count);
+    private Tag readTag(int depth, int maxDepth) throws IOException {
+        if (this.count++ > maxDepth) {
+            throw new IOException("Exceeds max depth: " + this.count);
         }
-        final int type = is.readByte() & 0xFF;
+        int type = this.is.readByte() & 0xFF;
         String name;
         if (type != NBTConstants.TYPE_END) {
-            final int nameLength = is.readShort() & 0xFFFF;
-            final byte[] nameBytes = new byte[nameLength];
-            is.readFully(nameBytes);
+            int nameLength = this.is.readShort() & 0xFFFF;
+            byte[] nameBytes = new byte[nameLength];
+            this.is.readFully(nameBytes);
             name = new String(nameBytes, NBTConstants.CHARSET);
         } else {
             name = "";
         }
         return readTagPayload(type, name, depth, maxDepth);
     }
-    
+
     /**
      * Reads the payload of a tag, given the name and type.
      *
@@ -89,11 +90,11 @@ public final class NBTInputStream implements Closeable {
      *
      * @throws IOException if an I/O error occurs.
      */
-    private Tag readTagPayload(final int type, final String name, final int depth, final int maxDepth) throws IOException {
-        if ((count++) > maxDepth) {
-            throw new IOException("Exceeds max depth: " + count);
+    private Tag readTagPayload(int type, String name, int depth, int maxDepth) throws IOException {
+        if (this.count++ > maxDepth) {
+            throw new IOException("Exceeds max depth: " + this.count);
         }
-        count++;
+        this.count++;
         switch (type) {
             case NBTConstants.TYPE_END:
                 if (depth == 0) {
@@ -102,54 +103,54 @@ public final class NBTInputStream implements Closeable {
                     return new EndTag();
                 }
             case NBTConstants.TYPE_BYTE:
-                return new ByteTag(name, is.readByte());
+                return new ByteTag(name, this.is.readByte());
             case NBTConstants.TYPE_SHORT:
-                return new ShortTag(name, is.readShort());
+                return new ShortTag(name, this.is.readShort());
             case NBTConstants.TYPE_INT:
-                return new IntTag(name, is.readInt());
+                return new IntTag(name, this.is.readInt());
             case NBTConstants.TYPE_LONG:
-                return new LongTag(name, is.readLong());
+                return new LongTag(name, this.is.readLong());
             case NBTConstants.TYPE_FLOAT:
-                return new FloatTag(name, is.readFloat());
+                return new FloatTag(name, this.is.readFloat());
             case NBTConstants.TYPE_DOUBLE:
-                return new DoubleTag(name, is.readDouble());
+                return new DoubleTag(name, this.is.readDouble());
             case NBTConstants.TYPE_BYTE_ARRAY:
-                int length = is.readInt();
-                
+                int length = this.is.readInt();
+
                 // Max depth
-                if ((count += length) > maxDepth) {
-                    throw new IOException("Exceeds max depth: " + count);
+                if ((this.count += length) > maxDepth) {
+                    throw new IOException("Exceeds max depth: " + this.count);
                     //
                 }
-                
+
                 byte[] bytes = new byte[length];
-                is.readFully(bytes);
+                this.is.readFully(bytes);
                 return new ByteArrayTag(name, bytes);
             case NBTConstants.TYPE_STRING:
-                length = is.readShort();
-                
+                length = this.is.readShort();
+
                 // Max depth
-                if ((count += length) > maxDepth) {
-                    throw new IOException("Exceeds max depth: " + count);
+                if ((this.count += length) > maxDepth) {
+                    throw new IOException("Exceeds max depth: " + this.count);
                     //
                 }
-                
+
                 bytes = new byte[length];
-                is.readFully(bytes);
+                this.is.readFully(bytes);
                 return new StringTag(name, new String(bytes, NBTConstants.CHARSET));
             case NBTConstants.TYPE_LIST:
-                final int childType = is.readByte();
-                length = is.readInt();
-                
+                int childType = this.is.readByte();
+                length = this.is.readInt();
+
                 // Max depth
-                if ((count += length) > maxDepth) {
-                    throw new IOException("Exceeds max depth: " + count);
+                if ((this.count += length) > maxDepth) {
+                    throw new IOException("Exceeds max depth: " + this.count);
                     //
                 }
-                
-                final List<Tag> tagList = new ArrayList<Tag>();
+
+                List<Tag> tagList = new ArrayList<Tag>();
                 for (int i = 0; i < length; ++i) {
-                    final Tag tag = readTagPayload(childType, "", depth + 1, maxDepth);
+                    Tag tag = readTagPayload(childType, "", depth + 1, maxDepth);
                     if (tag instanceof EndTag) {
                         throw new IOException("TAG_End not permitted in a list.");
                     }
@@ -157,9 +158,9 @@ public final class NBTInputStream implements Closeable {
                 }
                 return new ListTag(name, NBTUtils.getTypeClass(childType), tagList);
             case NBTConstants.TYPE_COMPOUND:
-                final Map<String, Tag> tagMap = new HashMap<String, Tag>();
+                Map<String, Tag> tagMap = new HashMap<String, Tag>();
                 while (true) {
-                    final Tag tag = readTag(depth + 1, maxDepth);
+                    Tag tag = readTag(depth + 1, maxDepth);
                     if (tag instanceof EndTag) {
                         break;
                     } else {
@@ -168,24 +169,24 @@ public final class NBTInputStream implements Closeable {
                 }
                 return new CompoundTag(name, tagMap);
             case NBTConstants.TYPE_INT_ARRAY:
-                length = is.readInt();
+                length = this.is.readInt();
                 // Max depth
-                if ((count += length) > maxDepth) {
-                    throw new IOException("Exceeds max depth: " + count);
+                if ((this.count += length) > maxDepth) {
+                    throw new IOException("Exceeds max depth: " + this.count);
                 }
                 //
-                final int[] data = new int[length];
+                int[] data = new int[length];
                 for (int i = 0; i < length; i++) {
-                    data[i] = is.readInt();
+                    data[i] = this.is.readInt();
                 }
                 return new IntArrayTag(name, data);
             default:
                 throw new IOException("Invalid tag type: " + type + ".");
         }
     }
-    
+
     @Override
     public void close() throws IOException {
-        is.close();
+        this.is.close();
     }
 }
diff --git a/Core/src/main/java/com/intellectualcrafters/jnbt/NBTOutputStream.java b/Core/src/main/java/com/intellectualcrafters/jnbt/NBTOutputStream.java
index e4a249341..7aa117761 100644
--- a/Core/src/main/java/com/intellectualcrafters/jnbt/NBTOutputStream.java
+++ b/Core/src/main/java/com/intellectualcrafters/jnbt/NBTOutputStream.java
@@ -16,11 +16,12 @@ import java.util.List;
  * @author Graham Edgecombe
  */
 public final class NBTOutputStream implements Closeable {
+
     /**
      * The output stream.
      */
     private final DataOutputStream os;
-    
+
     /**
      * Creates a new <code>NBTOutputStream</code>, which will write data to the specified underlying output stream.
      *
@@ -31,7 +32,7 @@ public final class NBTOutputStream implements Closeable {
     public NBTOutputStream(OutputStream os) {
         this.os = new DataOutputStream(os);
     }
-    
+
     /**
      * Writes a tag.
      *
@@ -51,7 +52,7 @@ public final class NBTOutputStream implements Closeable {
         }
         writeTagPayload(tag);
     }
-    
+
     /**
      * Writes tag payload.
      *
@@ -102,7 +103,7 @@ public final class NBTOutputStream implements Closeable {
                 throw new IOException("Invalid tag type: " + type + ".");
         }
     }
-    
+
     /**
      * Writes a <code>TAG_Byte</code> tag.
      *
@@ -113,7 +114,7 @@ public final class NBTOutputStream implements Closeable {
     private void writeByteTagPayload(ByteTag tag) throws IOException {
         this.os.writeByte(tag.getValue());
     }
-    
+
     /**
      * Writes a <code>TAG_Byte_Array</code> tag.
      *
@@ -126,7 +127,7 @@ public final class NBTOutputStream implements Closeable {
         this.os.writeInt(bytes.length);
         this.os.write(bytes);
     }
-    
+
     /**
      * Writes a <code>TAG_Compound</code> tag.
      *
@@ -140,7 +141,7 @@ public final class NBTOutputStream implements Closeable {
         }
         this.os.writeByte((byte) 0); // end tag - better way?
     }
-    
+
     /**
      * Writes a <code>TAG_List</code> tag.
      *
@@ -158,7 +159,7 @@ public final class NBTOutputStream implements Closeable {
             writeTagPayload(tag1);
         }
     }
-    
+
     /**
      * Writes a <code>TAG_String</code> tag.
      *
@@ -171,7 +172,7 @@ public final class NBTOutputStream implements Closeable {
         this.os.writeShort(bytes.length);
         this.os.write(bytes);
     }
-    
+
     /**
      * Writes a <code>TAG_Double</code> tag.
      *
@@ -182,7 +183,7 @@ public final class NBTOutputStream implements Closeable {
     private void writeDoubleTagPayload(DoubleTag tag) throws IOException {
         this.os.writeDouble(tag.getValue());
     }
-    
+
     /**
      * Writes a <code>TAG_Float</code> tag.
      *
@@ -193,7 +194,7 @@ public final class NBTOutputStream implements Closeable {
     private void writeFloatTagPayload(FloatTag tag) throws IOException {
         this.os.writeFloat(tag.getValue());
     }
-    
+
     /**
      * Writes a <code>TAG_Long</code> tag.
      *
@@ -204,7 +205,7 @@ public final class NBTOutputStream implements Closeable {
     private void writeLongTagPayload(LongTag tag) throws IOException {
         this.os.writeLong(tag.getValue());
     }
-    
+
     /**
      * Writes a <code>TAG_Int</code> tag.
      *
@@ -215,7 +216,7 @@ public final class NBTOutputStream implements Closeable {
     private void writeIntTagPayload(IntTag tag) throws IOException {
         this.os.writeInt(tag.getValue());
     }
-    
+
     /**
      * Writes a <code>TAG_Short</code> tag.
      *
@@ -226,7 +227,7 @@ public final class NBTOutputStream implements Closeable {
     private void writeShortTagPayload(ShortTag tag) throws IOException {
         this.os.writeShort(tag.getValue());
     }
-    
+
     /**
      * Writes a <code>TAG_Empty</code> tag.
      *
@@ -243,12 +244,12 @@ public final class NBTOutputStream implements Closeable {
             this.os.writeInt(element);
         }
     }
-    
+
     @Override
     public void close() throws IOException {
         this.os.close();
     }
-    
+
     /**
      * Flush output
      * @throws IOException
diff --git a/Core/src/main/java/com/intellectualcrafters/jnbt/NBTUtils.java b/Core/src/main/java/com/intellectualcrafters/jnbt/NBTUtils.java
index 8dfa1ea61..3b8bba993 100644
--- a/Core/src/main/java/com/intellectualcrafters/jnbt/NBTUtils.java
+++ b/Core/src/main/java/com/intellectualcrafters/jnbt/NBTUtils.java
@@ -6,11 +6,13 @@ import java.util.Map;
  * A class which contains NBT-related utility methods.
  */
 public final class NBTUtils {
+
     /**
      * Default private constructor.
      */
-    private NBTUtils() {}
-    
+    private NBTUtils() {
+    }
+
     /**
      * Gets the type name of a tag.
      *
@@ -18,7 +20,7 @@ public final class NBTUtils {
      *
      * @return The type name.
      */
-    public static String getTypeName(final Class<? extends Tag> clazz) {
+    public static String getTypeName(Class<? extends Tag> clazz) {
         if (clazz.equals(ByteArrayTag.class)) {
             return "TAG_Byte_Array";
         } else if (clazz.equals(ByteTag.class)) {
@@ -47,7 +49,7 @@ public final class NBTUtils {
             throw new IllegalArgumentException("Invalid tag class (" + clazz.getName() + ").");
         }
     }
-    
+
     /**
      * Gets the type code of a tag class.
      *
@@ -57,7 +59,7 @@ public final class NBTUtils {
      *
      * @throws IllegalArgumentException if the tag class is invalid.
      */
-    public static int getTypeCode(final Class<? extends Tag> clazz) {
+    public static int getTypeCode(Class<? extends Tag> clazz) {
         if (clazz.equals(ByteArrayTag.class)) {
             return NBTConstants.TYPE_BYTE_ARRAY;
         } else if (clazz.equals(ByteTag.class)) {
@@ -86,7 +88,7 @@ public final class NBTUtils {
             throw new IllegalArgumentException("Invalid tag class (" + clazz.getName() + ").");
         }
     }
-    
+
     /**
      * Gets the class of a type of tag.
      *
@@ -96,7 +98,7 @@ public final class NBTUtils {
      *
      * @throws IllegalArgumentException if the tag type is invalid.
      */
-    public static Class<? extends Tag> getTypeClass(final int type) {
+    public static Class<? extends Tag> getTypeClass(int type) {
         switch (type) {
             case NBTConstants.TYPE_END:
                 return EndTag.class;
@@ -126,7 +128,7 @@ public final class NBTUtils {
                 throw new IllegalArgumentException("Invalid tag type : " + type + ".");
         }
     }
-    
+
     /**
      * Get child tag of a NBT structure.
      *
@@ -137,11 +139,12 @@ public final class NBTUtils {
      *
      * @return child tag
      */
-    public static <T extends Tag> T getChildTag(final Map<String, Tag> items, final String key, final Class<T> expected) throws IllegalArgumentException {
+    public static <T extends Tag> T getChildTag(Map<String, Tag> items, String key, Class<T> expected)
+            throws IllegalArgumentException {
         if (!items.containsKey(key)) {
             throw new IllegalArgumentException("Missing a \"" + key + "\" tag");
         }
-        final Tag tag = items.get(key);
+        Tag tag = items.get(key);
         if (!expected.isInstance(tag)) {
             throw new IllegalArgumentException(key + " tag is not of tag type " + expected.getName());
         }
diff --git a/Core/src/main/java/com/intellectualcrafters/jnbt/ShortTag.java b/Core/src/main/java/com/intellectualcrafters/jnbt/ShortTag.java
index bba55bbea..c368282d3 100644
--- a/Core/src/main/java/com/intellectualcrafters/jnbt/ShortTag.java
+++ b/Core/src/main/java/com/intellectualcrafters/jnbt/ShortTag.java
@@ -4,41 +4,41 @@ package com.intellectualcrafters.jnbt;
  * The {@code TAG_Short} tag.
  */
 public final class ShortTag extends Tag {
+
     private final short value;
-    
+
     /**
      * Creates the tag with an empty name.
      *
      * @param value the value of the tag
      */
-    public ShortTag(final short value) {
-        super();
+    public ShortTag(short value) {
         this.value = value;
     }
-    
+
     /**
      * Creates the tag.
      *
      * @param name  the name of the tag
      * @param value the value of the tag
      */
-    public ShortTag(final String name, final short value) {
+    public ShortTag(String name, short value) {
         super(name);
         this.value = value;
     }
-    
+
     @Override
     public Short getValue() {
-        return value;
+        return this.value;
     }
-    
+
     @Override
     public String toString() {
-        final String name = getName();
+        String name = getName();
         String append = "";
-        if ((name != null) && !name.equals("")) {
+        if (name != null && !name.equals("")) {
             append = "(\"" + getName() + "\")";
         }
-        return "TAG_Short" + append + ": " + value;
+        return "TAG_Short" + append + ": " + this.value;
     }
 }
diff --git a/Core/src/main/java/com/intellectualcrafters/jnbt/StringTag.java b/Core/src/main/java/com/intellectualcrafters/jnbt/StringTag.java
index 6dce84d0e..1f8ceb123 100644
--- a/Core/src/main/java/com/intellectualcrafters/jnbt/StringTag.java
+++ b/Core/src/main/java/com/intellectualcrafters/jnbt/StringTag.java
@@ -6,43 +6,43 @@ import static com.google.common.base.Preconditions.checkNotNull;
  * The {@code TAG_String} tag.
  */
 public final class StringTag extends Tag {
+
     private final String value;
-    
+
     /**
      * Creates the tag with an empty name.
      *
      * @param value the value of the tag
      */
-    public StringTag(final String value) {
-        super();
+    public StringTag(String value) {
         checkNotNull(value);
         this.value = value;
     }
-    
+
     /**
      * Creates the tag.
      *
      * @param name  the name of the tag
      * @param value the value of the tag
      */
-    public StringTag(final String name, final String value) {
+    public StringTag(String name, String value) {
         super(name);
         checkNotNull(value);
         this.value = value;
     }
-    
+
     @Override
     public String getValue() {
-        return value;
+        return this.value;
     }
-    
+
     @Override
     public String toString() {
-        final String name = getName();
+        String name = getName();
         String append = "";
-        if ((name != null) && !name.equals("")) {
+        if (name != null && !name.equals("")) {
             append = "(\"" + getName() + "\")";
         }
-        return "TAG_String" + append + ": " + value;
+        return "TAG_String" + append + ": " + this.value;
     }
 }
diff --git a/Core/src/main/java/com/intellectualcrafters/jnbt/Tag.java b/Core/src/main/java/com/intellectualcrafters/jnbt/Tag.java
index 572071359..81a40d367 100644
--- a/Core/src/main/java/com/intellectualcrafters/jnbt/Tag.java
+++ b/Core/src/main/java/com/intellectualcrafters/jnbt/Tag.java
@@ -4,15 +4,16 @@ package com.intellectualcrafters.jnbt;
  * Represents a NBT tag.
  */
 public abstract class Tag {
+
     private final String name;
-    
+
     /**
      * Create a new tag with an empty name.
      */
     Tag() {
         this("");
     }
-    
+
     /**
      * Creates the tag with the specified name.
      *
@@ -24,16 +25,16 @@ public abstract class Tag {
         }
         this.name = name;
     }
-    
+
     /**
      * Gets the name of this tag.
      *
      * @return the name of this tag
      */
     public final String getName() {
-        return name;
+        return this.name;
     }
-    
+
     /**
      * Gets the value of this tag.
      *
diff --git a/Core/src/main/java/com/intellectualcrafters/plot/PS.java b/Core/src/main/java/com/intellectualcrafters/plot/PS.java
index ac4f95bdc..563c0977d 100644
--- a/Core/src/main/java/com/intellectualcrafters/plot/PS.java
+++ b/Core/src/main/java/com/intellectualcrafters/plot/PS.java
@@ -133,7 +133,7 @@ public class PS {
      */
     public PS(IPlotMain imp_class, String platform) {
         try {
-            instance = this;
+            PS.instance = this;
             this.thread = Thread.currentThread();
             SetupUtils.generators = new HashMap<>();
             this.IMP = imp_class;
@@ -151,16 +151,16 @@ public class PS {
             this.version = this.IMP.getPluginVersion();
             this.platform = platform;
             if (getJavaVersion() < 1.7) {
-                log(C.CONSOLE_JAVA_OUTDATED_1_7);
+                PS.log(C.CONSOLE_JAVA_OUTDATED_1_7);
                 this.IMP.disable();
                 return;
             }
             if (getJavaVersion() < 1.8) {
-                log(C.CONSOLE_JAVA_OUTDATED_1_8);
+                PS.log(C.CONSOLE_JAVA_OUTDATED_1_8);
             }
             this.TASK = this.IMP.getTaskManager();
             if (!C.ENABLED.s().isEmpty()) {
-                log(C.ENABLED);
+                PS.log(C.ENABLED);
             }
             setupConfigs();
             this.translationFile = new File(this.IMP.getDirectory() + File.separator + "translations" + File.separator + "PlotSquared.use_THIS.yml");
@@ -188,7 +188,7 @@ public class PS {
             if (Settings.METRICS) {
                 this.IMP.startMetrics();
             } else {
-                log(C.CONSOLE_PLEASE_ENABLE_METRICS);
+                PS.log(C.CONSOLE_PLEASE_ENABLE_METRICS);
             }
             if (Settings.CHUNK_PROCESSOR) {
                 this.IMP.registerChunkProcessor();
@@ -198,7 +198,7 @@ public class PS {
             TaskManager.runTaskLater(new Runnable() {
                 @Override
                 public void run() {
-                    PS.debug("Starting UUID caching");
+                    debug("Starting UUID caching");
                     UUIDHandler.startCaching(new Runnable() {
                         @Override
                         public void run() {
@@ -225,11 +225,11 @@ public class PS {
                                     @Override
                                     public void run() {
                                         if (PS.this.IMP.initPlotMeConverter()) {
-                                            log("&c=== IMPORTANT ===");
-                                            log("&cTHIS MESSAGE MAY BE EXTREMELY HELPFUL IF YOU HAVE TROUBLE CONVERTING PLOTME!");
-                                            log("&c - Make sure 'UUID.read-from-disk' is disabled (false)!");
-                                            log("&c - Sometimes the database can be locked, deleting PlotMe.jar beforehand will fix the issue!");
-                                            log("&c - After the conversion is finished, please set 'plotme-convert.enabled' to false in the "
+                                            PS.log("&c=== IMPORTANT ===");
+                                            PS.log("&cTHIS MESSAGE MAY BE EXTREMELY HELPFUL IF YOU HAVE TROUBLE CONVERTING PLOTME!");
+                                            PS.log("&c - Make sure 'UUID.read-from-disk' is disabled (false)!");
+                                            PS.log("&c - Sometimes the database can be locked, deleting PlotMe.jar beforehand will fix the issue!");
+                                            PS.log("&c - After the conversion is finished, please set 'plotme-convert.enabled' to false in the "
                                                     + "'settings.yml'");
                                         }
                                     }
@@ -275,9 +275,10 @@ public class PS {
                     if (url != null) {
                         PS.this.update = url;
                     } else if (PS.this.lastVersion == null) {
-                        log("&aThanks for installing PlotSquared!");
-                    } else if (!PS.get().checkVersion(PS.this.lastVersion, PS.this.version)) {
-                        log("&aThanks for updating from " + StringMan.join(PS.this.lastVersion, ".") + " to " + StringMan.join(PS.this.version, ".")
+                        PS.log("&aThanks for installing PlotSquared!");
+                    } else if (!get().checkVersion(PS.this.lastVersion, PS.this.version)) {
+                        PS.log("&aThanks for updating from " + StringMan.join(PS.this.lastVersion, ".") + " to " + StringMan
+                                .join(PS.this.version, ".")
                                 + "!");
                         DBFunc.dbManager.updateTables(PS.this.lastVersion);
                     }
@@ -303,11 +304,11 @@ public class PS {
                                 continue;
                             }
                             if (!WorldUtil.IMP.isWorld(world)) {
-                                PS.debug("&c`" + world + "` was not properly loaded - PlotSquared will now try to load it properly: ");
-                                PS.debug(
+                                debug("&c`" + world + "` was not properly loaded - PlotSquared will now try to load it properly: ");
+                                debug(
                                         "&8 - &7Are you trying to delete this world? Remember to remove it from the settings.yml, bukkit.yml and "
                                                 + "multiverse worlds.yml");
-                                PS.debug("&8 - &7Your world management plugin may be faulty (or non existent)");
+                                debug("&8 - &7Your world management plugin may be faulty (or non existent)");
                                 PS.this.IMP.setGenerator(world);
                             }
                         }
@@ -335,7 +336,7 @@ public class PS {
      * @return the instance created by IPlotMain
      */
     public static PS get() {
-        return instance;
+        return PS.instance;
     }
 
     /**
@@ -345,7 +346,7 @@ public class PS {
      * @see IPlotMain#log(String)
      */
     public static void log(Object message) {
-        get().IMP.log(StringMan.getString(message));
+        PS.get().IMP.log(StringMan.getString(message));
     }
 
     public static void stacktrace() {
@@ -360,7 +361,7 @@ public class PS {
      */
     public static void debug(Object message) {
         if (Settings.DEBUG) {
-            log(message);
+            PS.log(message);
         }
     }
 
@@ -1342,7 +1343,7 @@ public class PS {
         int type = worldSection != null ? worldSection.getInt("generator.type") : 0;
         if (type == 0) {
             if (this.plotAreaMap.containsKey(world)) {
-                PS.debug("World possibly already loaded: " + world);
+                debug("World possibly already loaded: " + world);
                 return;
             }
             IndependentPlotGenerator pg;
@@ -1368,10 +1369,10 @@ public class PS {
             // Conventional plot generator
             PlotArea plotArea = pg.getNewPlotArea(world, null, null, null);
             PlotManager plotManager = pg.getNewPlotManager();
-            log(C.PREFIX + "&aDetected world load for '" + world + "'");
-            log(C.PREFIX + "&3 - generator: &7" + baseGenerator + ">" + pg);
-            log(C.PREFIX + "&3 - plotworld: &7" + plotArea.getClass().getName());
-            log(C.PREFIX + "&3 - manager: &7" + plotManager.getClass().getName());
+            PS.log(C.PREFIX + "&aDetected world load for '" + world + "'");
+            PS.log(C.PREFIX + "&3 - generator: &7" + baseGenerator + ">" + pg);
+            PS.log(C.PREFIX + "&3 - plotworld: &7" + plotArea.getClass().getName());
+            PS.log(C.PREFIX + "&3 - manager: &7" + plotManager.getClass().getName());
             if (!this.config.contains(path)) {
                 this.config.createSection(path);
                 worldSection = this.config.getConfigurationSection(path);
@@ -1394,10 +1395,10 @@ public class PS {
             ConfigurationSection areasSection = worldSection.getConfigurationSection("areas");
             if (areasSection == null) {
                 if (this.plotAreaMap.containsKey(world)) {
-                    PS.debug("World possibly already loaded: " + world);
+                    debug("World possibly already loaded: " + world);
                     return;
                 }
-                log(C.PREFIX + "&aDetected world load for '" + world + "'");
+                PS.log(C.PREFIX + "&aDetected world load for '" + world + "'");
                 String gen_string = worldSection.getString("generator.plugin", "PlotSquared");
                 if (type == 2) {
                     Set<PlotCluster> clusters = this.clusters_tmp != null ? this.clusters_tmp.get(world) : new HashSet<PlotCluster>();
@@ -1413,7 +1414,7 @@ public class PS {
                         worldSection.createSection("areas." + fullId);
                         DBFunc.replaceWorld(world, world + ";" + name, pos1, pos2); // NPE
 
-                        log(C.PREFIX + "&3 - " + name + "-" + pos1 + "-" + pos2);
+                        PS.log(C.PREFIX + "&3 - " + name + "-" + pos1 + "-" + pos2);
                         GeneratorWrapper<?> areaGen = this.IMP.getGenerator(world, gen_string);
                         if (areaGen == null) {
                             throw new IllegalArgumentException("Invalid Generator: " + gen_string);
@@ -1426,10 +1427,10 @@ public class PS {
                         } catch (IOException e) {
                             e.printStackTrace();
                         }
-                        log(C.PREFIX + "&c | &9generator: &7" + baseGenerator + ">" + areaGen);
-                        log(C.PREFIX + "&c | &9plotworld: &7" + pa);
-                        log(C.PREFIX + "&c | &9manager: &7" + pa);
-                        log(C.PREFIX + "&cNote: &7Area created for cluster:" + name + " (invalid or old configuration?)");
+                        PS.log(C.PREFIX + "&c | &9generator: &7" + baseGenerator + ">" + areaGen);
+                        PS.log(C.PREFIX + "&c | &9plotworld: &7" + pa);
+                        PS.log(C.PREFIX + "&c | &9manager: &7" + pa);
+                        PS.log(C.PREFIX + "&cNote: &7Area created for cluster:" + name + " (invalid or old configuration?)");
                         areaGen.getPlotGenerator().initialize(pa);
                         areaGen.augment(pa);
                         toLoad.add(pa);
@@ -1451,9 +1452,9 @@ public class PS {
                 } catch (IOException e) {
                     e.printStackTrace();
                 }
-                log(C.PREFIX + "&3 - generator: &7" + baseGenerator + ">" + areaGen);
-                log(C.PREFIX + "&3 - plotworld: &7" + pa);
-                log(C.PREFIX + "&3 - manager: &7" + pa.getPlotManager());
+                PS.log(C.PREFIX + "&3 - generator: &7" + baseGenerator + ">" + areaGen);
+                PS.log(C.PREFIX + "&3 - plotworld: &7" + pa);
+                PS.log(C.PREFIX + "&3 - manager: &7" + pa.getPlotManager());
                 areaGen.getPlotGenerator().initialize(pa);
                 areaGen.augment(pa);
                 addPlotArea(pa);
@@ -1463,7 +1464,7 @@ public class PS {
                 throw new IllegalArgumentException("Invalid type for multi-area world. Expected `2`, got `" + type + "`");
             }
             for (String areaId : areasSection.getKeys(false)) {
-                log(C.PREFIX + "&3 - " + areaId);
+                PS.log(C.PREFIX + "&3 - " + areaId);
                 int i1 = areaId.indexOf("-");
                 int i2 = areaId.indexOf(";");
                 if (i1 == -1 || i2 == -1) {
@@ -1525,10 +1526,10 @@ public class PS {
                 } catch (IOException e) {
                     e.printStackTrace();
                 }
-                log(C.PREFIX + "&aDetected area load for '" + world + "'");
-                log(C.PREFIX + "&c | &9generator: &7" + baseGenerator + ">" + areaGen);
-                log(C.PREFIX + "&c | &9plotworld: &7" + pa);
-                log(C.PREFIX + "&c | &9manager: &7" + pa.getPlotManager());
+                PS.log(C.PREFIX + "&aDetected area load for '" + world + "'");
+                PS.log(C.PREFIX + "&c | &9generator: &7" + baseGenerator + ">" + areaGen);
+                PS.log(C.PREFIX + "&c | &9plotworld: &7" + pa);
+                PS.log(C.PREFIX + "&c | &9manager: &7" + pa.getPlotManager());
                 areaGen.getPlotGenerator().initialize(pa);
                 areaGen.augment(pa);
                 addPlotArea(pa);
@@ -1551,7 +1552,7 @@ public class PS {
             for (String element : split) {
                 String[] pair = element.split("=");
                 if (pair.length != 2) {
-                    log("&cNo value provided for: &7" + element);
+                    PS.log("&cNo value provided for: &7" + element);
                     return false;
                 }
                 String key = pair[0].toLowerCase();
@@ -1560,52 +1561,44 @@ public class PS {
                 try {
                     switch (key) {
                         case "s":
-                        case "size": {
+                        case "size":
                             this.config.set(base + "plot.size", Configuration.INTEGER.parseString(value).shortValue());
                             break;
-                        }
                         case "g":
-                        case "gap": {
+                        case "gap":
                             this.config.set(base + "road.width", Configuration.INTEGER.parseString(value).shortValue());
                             break;
-                        }
                         case "h":
-                        case "height": {
+                        case "height":
                             this.config.set(base + "road.height", Configuration.INTEGER.parseString(value).shortValue());
                             this.config.set(base + "plot.height", Configuration.INTEGER.parseString(value).shortValue());
                             this.config.set(base + "wall.height", Configuration.INTEGER.parseString(value).shortValue());
                             break;
-                        }
                         case "f":
-                        case "floor": {
+                        case "floor":
                             this.config.set(base + "plot.floor",
                                     new ArrayList<>(Arrays.asList(StringMan.join(Configuration.BLOCKLIST.parseString(value), ",").split(","))));
                             break;
-                        }
                         case "m":
-                        case "main": {
+                        case "main":
                             this.config.set(base + "plot.filling",
                                     new ArrayList<>(Arrays.asList(StringMan.join(Configuration.BLOCKLIST.parseString(value), ",").split(","))));
                             break;
-                        }
                         case "w":
-                        case "wall": {
+                        case "wall":
                             this.config.set(base + "wall.filling", Configuration.BLOCK.parseString(value).toString());
                             break;
-                        }
                         case "b":
-                        case "border": {
+                        case "border":
                             this.config.set(base + "wall.block", Configuration.BLOCK.parseString(value).toString());
                             break;
-                        }
-                        default: {
-                            log("&cKey not found: &7" + element);
+                        default:
+                            PS.log("&cKey not found: &7" + element);
                             return false;
-                        }
                     }
                 } catch (Exception e) {
                     e.printStackTrace();
-                    log("&cInvalid value: &7" + value + " in arg " + element);
+                    PS.log("&cInvalid value: &7" + value + " in arg " + element);
                     return false;
                 }
             }
@@ -1661,9 +1654,9 @@ public class PS {
         } catch (IOException e) {
             MainUtil.sendMessage(sender, "Failed to update PlotSquared");
             MainUtil.sendMessage(sender, " - Please update manually");
-            log("============ Stacktrace ============");
+            PS.log("============ Stacktrace ============");
             e.printStackTrace();
-            log("====================================");
+            PS.log("====================================");
         }
         return false;
     }
@@ -1717,7 +1710,7 @@ public class PS {
             }
         } catch (IOException e) {
             e.printStackTrace();
-            log("&cCould not save " + file);
+            PS.log("&cCould not save " + file);
         }
     }
 
@@ -1755,7 +1748,7 @@ public class PS {
             DBFunc.close();
             UUIDHandler.handleShutdown();
         } catch (NullPointerException e) {
-            log("&cCould not close database connection!");
+            PS.log("&cCould not close database connection!");
         }
     }
 
@@ -1765,8 +1758,8 @@ public class PS {
     public void setupDatabase() {
         try {
             if (Settings.DB.USE_MONGO) {
-                log(C.PREFIX + "MongoDB is not yet implemented");
-                log(C.PREFIX + "&cNo storage type is set!");
+                PS.log(C.PREFIX + "MongoDB is not yet implemented");
+                PS.log(C.PREFIX + "&cNo storage type is set!");
                 this.IMP.disable();
                 return;
             }
@@ -1776,7 +1769,7 @@ public class PS {
                 } else if (Settings.DB.USE_SQLITE) {
                     this.database = new SQLite(this.IMP.getDirectory() + File.separator + Settings.DB.SQLITE_DB + ".db");
                 } else {
-                    log(C.PREFIX + "&cNo storage type is set!");
+                    PS.log(C.PREFIX + "&cNo storage type is set!");
                     this.IMP.disable();
                     return;
                 }
@@ -1785,18 +1778,18 @@ public class PS {
             this.plots_tmp = DBFunc.getPlots();
             this.clusters_tmp = DBFunc.getClusters();
         } catch (ClassNotFoundException | SQLException e) {
-            log(C.PREFIX + "&cFailed to open DATABASE connection. The plugin will disable itself.");
+            PS.log(C.PREFIX + "&cFailed to open DATABASE connection. The plugin will disable itself.");
             if (Settings.DB.USE_MONGO) {
-                log("$4MONGO");
+                PS.log("$4MONGO");
             } else if (Settings.DB.USE_MYSQL) {
-                log("$4MYSQL");
+                PS.log("$4MYSQL");
             } else if (Settings.DB.USE_SQLITE) {
-                log("$4SQLITE");
+                PS.log("$4SQLITE");
             }
-            log("&d==== Here is an ugly stacktrace, if you are interested in those things ===");
+            PS.log("&d==== Here is an ugly stacktrace, if you are interested in those things ===");
             e.printStackTrace();
-            log("&d==== End of stacktrace ====");
-            log("&6Please go to the PlotSquared 'storage.yml' and configure the database correctly.");
+            PS.log("&d==== End of stacktrace ====");
+            PS.log("&6Please go to the PlotSquared 'storage.yml' and configure the database correctly.");
             this.IMP.disable();
         }
     }
@@ -1996,15 +1989,15 @@ public class PS {
         if (keep > 0 || ignore > 0) {
             options.put("clear.auto.threshold", 1);
             options.put("clear.auto.enabled", false);
-            log("&cIMPORTANT MESSAGE ABOUT THIS UPDATE!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
-            log("&cSorry for all the exclamation marks, but this could be important.");
-            log("&cPlot clearing has changed to a new system that requires calibration.");
-            log("&cThis is how it will work: ");
-            log("&c - Players will rate plots");
-            log("&c - When enough plots are rated, you can run /plot debugexec calibrate-analysis");
-            log("&c - You can decide the (rough) percentage of expired plots to clear");
-            log("&c - To just clear all expired plot, ignore this and set: &7threshold: -1");
-            log("&cMore information:&7 https://github.com/IntellectualSites/PlotSquared/wiki/Plot-analysis:");
+            PS.log("&cIMPORTANT MESSAGE ABOUT THIS UPDATE!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
+            PS.log("&cSorry for all the exclamation marks, but this could be important.");
+            PS.log("&cPlot clearing has changed to a new system that requires calibration.");
+            PS.log("&cThis is how it will work: ");
+            PS.log("&c - Players will rate plots");
+            PS.log("&c - When enough plots are rated, you can run /plot debugexec calibrate-analysis");
+            PS.log("&c - You can decide the (rough) percentage of expired plots to clear");
+            PS.log("&c - To just clear all expired plot, ignore this and set: &7threshold: -1");
+            PS.log("&cMore information:&7 https://github.com/IntellectualSites/PlotSquared/wiki/Plot-analysis:");
         } else {
             options.put("clear.auto.threshold", Settings.CLEAR_THRESHOLD);
         }
@@ -2172,7 +2165,7 @@ public class PS {
         Settings.MAX_AUTO_SIZE = this.config.getInt("claim.max-auto-area");
         Settings.MAX_PLOTS = this.config.getInt("max_plots");
         if (Settings.MAX_PLOTS > 32767) {
-            log("&c`max_plots` Is set too high! This is a per player setting and does not need to be very large.");
+            PS.log("&c`max_plots` Is set too high! This is a per player setting and does not need to be very large.");
             Settings.MAX_PLOTS = 32767;
         }
         Settings.GLOBAL_LIMIT = this.config.getBoolean("global_limit");
@@ -2180,7 +2173,7 @@ public class PS {
         // Misc
         Settings.DEBUG = this.config.getBoolean("debug");
         if (Settings.DEBUG) {
-            log(C.PREFIX + "&6Debug Mode Enabled (Default). Edit the config to turn this off.");
+            PS.log(C.PREFIX + "&6Debug Mode Enabled (Default). Edit the config to turn this off.");
         }
         Settings.CONSOLE_COLOR = this.config.getBoolean("console.color");
         if (!this.config.getBoolean("chat.fancy") || !checkVersion(this.IMP.getServerVersion(), 1, 8, 0)) {
@@ -2201,7 +2194,7 @@ public class PS {
     public void setupConfigs() {
         File folder = new File(this.IMP.getDirectory() + File.separator + "config");
         if (!folder.exists() && !folder.mkdirs()) {
-            log(C.PREFIX + "&cFailed to create the /plugins/config folder. Please create it manually.");
+            PS.log(C.PREFIX + "&cFailed to create the /plugins/config folder. Please create it manually.");
         }
         try {
             this.styleFile = new File(this.IMP.getDirectory() + File.separator + "translations" + File.separator + "style.yml");
@@ -2210,50 +2203,50 @@ public class PS {
                     this.styleFile.getParentFile().mkdirs();
                 }
                 if (!this.styleFile.createNewFile()) {
-                    log("Could not create the style file, please create \"translations/style.yml\" manually");
+                    PS.log("Could not create the style file, please create \"translations/style.yml\" manually");
                 }
             }
             this.style = YamlConfiguration.loadConfiguration(this.styleFile);
             setupStyle();
         } catch (IOException err) {
             err.printStackTrace();
-            log("failed to save style.yml");
+            PS.log("failed to save style.yml");
         }
         try {
             this.configFile = new File(this.IMP.getDirectory() + File.separator + "config" + File.separator + "settings.yml");
             if (!this.configFile.exists()) {
                 if (!this.configFile.createNewFile()) {
-                    log("Could not create the settings file, please create \"settings.yml\" manually.");
+                    PS.log("Could not create the settings file, please create \"settings.yml\" manually.");
                 }
             }
             this.config = YamlConfiguration.loadConfiguration(this.configFile);
             setupConfig();
         } catch (IOException err_trans) {
-            log("Failed to save settings.yml");
+            PS.log("Failed to save settings.yml");
         }
         try {
             this.storageFile = new File(this.IMP.getDirectory() + File.separator + "config" + File.separator + "storage.yml");
             if (!this.storageFile.exists()) {
                 if (!this.storageFile.createNewFile()) {
-                    log("Could not the storage settings file, please create \"storage.yml\" manually.");
+                    PS.log("Could not the storage settings file, please create \"storage.yml\" manually.");
                 }
             }
             this.storage = YamlConfiguration.loadConfiguration(this.storageFile);
             setupStorage();
         } catch (IOException err_trans) {
-            log("Failed to save storage.yml");
+            PS.log("Failed to save storage.yml");
         }
         try {
             this.commandsFile = new File(this.IMP.getDirectory() + File.separator + "config" + File.separator + "commands.yml");
             if (!this.commandsFile.exists()) {
                 if (!this.commandsFile.createNewFile()) {
-                    log("Could not the storage settings file, please create \"commands.yml\" manually.");
+                    PS.log("Could not the storage settings file, please create \"commands.yml\" manually.");
                 }
             }
             this.commands = YamlConfiguration.loadConfiguration(this.commandsFile);
             setupStorage();
         } catch (IOException err_trans) {
-            log("Failed to save commands.yml");
+            PS.log("Failed to save commands.yml");
         }
         try {
             this.style.save(this.styleFile);
@@ -2261,7 +2254,7 @@ public class PS {
             this.storage.save(this.storageFile);
             this.commands.save(this.commandsFile);
         } catch (IOException e) {
-            log("Configuration file saving failed");
+            PS.log("Configuration file saving failed");
             e.printStackTrace();
         }
     }
@@ -2313,7 +2306,7 @@ public class PS {
             settings.put("Schematics Save Path", "" + Settings.SCHEMATIC_SAVE_PATH);
             settings.put("API Location", "" + Settings.API_URL);
             for (Entry<String, String> setting : settings.entrySet()) {
-                log(C.PREFIX + String.format("&cKey: &6%s&c, Value: &6%s", setting.getKey(), setting.getValue()));
+                PS.log(C.PREFIX + String.format("&cKey: &6%s&c, Value: &6%s", setting.getKey(), setting.getValue()));
             }
         }
     }
diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Area.java b/Core/src/main/java/com/intellectualcrafters/plot/commands/Area.java
index 97fc290cc..6d7ae5cb6 100644
--- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Area.java
+++ b/Core/src/main/java/com/intellectualcrafters/plot/commands/Area.java
@@ -51,17 +51,16 @@ public class Area extends SubCommand {
         switch (args[0].toLowerCase()) {
             case "c":
             case "setup":
-            case "create": {
+            case "create":
                 if (!Permissions.hasPermission(plr, "plots.area.create")) {
                     C.NO_PERMISSION.send(plr, "plots.area.create");
                     return false;
                 }
                 switch (args.length) {
-                    case 1: {
+                    case 1:
                         C.COMMAND_SYNTAX.send(plr, "/plot area create [world[:id]] [<modifier>=<value>]...");
                         return false;
-                    }
-                    case 2: {
+                    case 2:
                         switch (args[1].toLowerCase()) {
                             case "pos1": { // Set position 1
                                 HybridPlotWorld area = plr.getMeta("area_create_area");
@@ -69,14 +68,14 @@ public class Area extends SubCommand {
                                     C.COMMAND_SYNTAX.send(plr, "/plot area create [world[:id]] [<modifier>=<value>]...");
                                     return false;
                                 }
-                                Location loc = plr.getLocation();
-                                plr.setMeta("area_pos1", loc);
-                                C.SET_ATTRIBUTE.send(plr, "area_pos1", loc.getX() + "," + loc.getZ());
+                                Location location = plr.getLocation();
+                                plr.setMeta("area_pos1", location);
+                                C.SET_ATTRIBUTE.send(plr, "area_pos1", location.getX() + "," + location.getZ());
                                 MainUtil.sendMessage(plr, "You will now set pos2: /plot area create pos2"
                                         + "\nNote: The chosen plot size may result in the created area not exactly matching your second position.");
                                 return true;
                             }
-                            case "pos2": { // Set position 2 and finish creation for type=2 (partial)
+                            case "pos2":  // Set position 2 and finish creation for type=2 (partial)
                                 final HybridPlotWorld area = plr.getMeta("area_create_area");
                                 if (area == null) {
                                     C.COMMAND_SYNTAX.send(plr, "/plot area create [world[:id]] [<modifier>=<value>]...");
@@ -147,9 +146,7 @@ public class Area extends SubCommand {
                                     run.run();
                                 }
                                 return true;
-                            }
                         }
-                    }
                     default: // Start creation
                         final SetupObject object = new SetupObject();
                         String[] split = args[1].split(":");
@@ -180,59 +177,49 @@ public class Area extends SubCommand {
                             }
                             switch (pair[0].toLowerCase()) {
                                 case "s":
-                                case "size": {
+                                case "size":
                                     pa.PLOT_WIDTH = Integer.parseInt(pair[1]);
                                     pa.SIZE = (short) (pa.PLOT_WIDTH + pa.ROAD_WIDTH);
                                     break;
-                                }
                                 case "g":
-                                case "gap": {
+                                case "gap":
                                     pa.ROAD_WIDTH = Integer.parseInt(pair[1]);
                                     pa.SIZE = (short) (pa.PLOT_WIDTH + pa.ROAD_WIDTH);
                                     break;
-                                }
                                 case "h":
-                                case "height": {
+                                case "height":
                                     int value = Integer.parseInt(pair[1]);
                                     pa.PLOT_HEIGHT = value;
                                     pa.ROAD_HEIGHT = value;
                                     pa.WALL_HEIGHT = value;
                                     break;
-                                }
                                 case "f":
-                                case "floor": {
+                                case "floor":
                                     pa.TOP_BLOCK = Configuration.BLOCKLIST.parseString(pair[1]);
                                     break;
-                                }
                                 case "m":
-                                case "main": {
+                                case "main":
                                     pa.MAIN_BLOCK = Configuration.BLOCKLIST.parseString(pair[1]);
                                     break;
-                                }
                                 case "w":
-                                case "wall": {
+                                case "wall":
                                     pa.WALL_FILLING = Configuration.BLOCK.parseString(pair[1]);
                                     break;
-                                }
                                 case "b":
-                                case "border": {
+                                case "border":
                                     pa.WALL_BLOCK = Configuration.BLOCK.parseString(pair[1]);
                                     break;
-                                }
-                                case "terrain": {
+                                case "terrain":
                                     pa.TERRAIN = Integer.parseInt(pair[1]);
                                     object.terrain = pa.TERRAIN;
                                     break;
-                                }
-                                case "type": {
+                                case "type":
                                     pa.TYPE = Integer.parseInt(pair[1]);
                                     object.type = pa.TYPE;
                                     break;
-                                }
-                                default: {
+                                default:
                                     C.COMMAND_SYNTAX.send(plr, "/plot area create [world[:id]] [<modifier>=<value>]...");
                                     return false;
-                                }
                             }
                         }
                         if (pa.TYPE != 2) {
@@ -292,7 +279,6 @@ public class Area extends SubCommand {
                         break;
                 }
                 return true;
-            }
             case "i":
             case "info": {
                 if (!Permissions.hasPermission(plr, "plots.area.info")) {
@@ -349,7 +335,7 @@ public class Area extends SubCommand {
                 return true;
             }
             case "l":
-            case "list": {
+            case "list":
                 if (!Permissions.hasPermission(plr, "plots.area.list")) {
                     C.NO_PERMISSION.send(plr, "plots.area.list");
                     return false;
@@ -407,7 +393,6 @@ public class Area extends SubCommand {
                     }
                 }, "/plot area list", C.AREA_LIST_HEADER_PAGED.s());
                 return true;
-            }
             case "regen":
             case "regenerate": {
                 if (!Permissions.hasPermission(plr, "plots.area.regen")) {
@@ -435,7 +420,7 @@ public class Area extends SubCommand {
             case "v":
             case "teleport":
             case "visit":
-            case "tp": {
+            case "tp":
                 if (!Permissions.hasPermission(plr, "plots.area.tp")) {
                     C.NO_PERMISSION.send(plr, "plots.area.tp");
                     return false;
@@ -460,16 +445,14 @@ public class Area extends SubCommand {
                 }
                 plr.teleport(center);
                 return true;
-            }
             case "delete":
-            case "remove": {
+            case "remove":
                 MainUtil.sendMessage(plr, "$1World creation settings may be stored in multiple locations:"
                         + "\n$3 - $2Bukkit bukkit.yml"
                         + "\n$3 - $2PlotSquared settings.yml"
                         + "\n$3 - $2Multiverse worlds.yml (or any world management plugin)"
                         + "\n$1Stop the server and delete it from these locations.");
                 return true;
-            }
         }
         C.COMMAND_SYNTAX.send(plr, getUsage());
         return false;
diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/BO3.java b/Core/src/main/java/com/intellectualcrafters/plot/commands/BO3.java
index c4f951af9..a5a54b483 100644
--- a/Core/src/main/java/com/intellectualcrafters/plot/commands/BO3.java
+++ b/Core/src/main/java/com/intellectualcrafters/plot/commands/BO3.java
@@ -26,7 +26,7 @@ public class BO3 extends SubCommand {
     public boolean onCommand(PlotPlayer plr, String[] args) {
         Location loc = plr.getLocation();
         Plot plot = loc.getPlotAbs();
-        if ((plot == null) || !plot.hasOwner()) {
+        if (plot == null || !plot.hasOwner()) {
             return !sendMessage(plr, C.NOT_IN_PLOT);
         }
         if (!plot.isOwner(plr.getUUID()) && !Permissions.hasPermission(plr, "plots.admin.command.bo3")) {
@@ -40,21 +40,18 @@ public class BO3 extends SubCommand {
         switch (args[0].toLowerCase()) {
             case "output":
             case "save":
-            case "export": {
+            case "export":
                 return BO3Handler.saveBO3(plr, plot);
-            }
             case "paste":
             case "load":
             case "import":
-            case "input": {
+            case "input":
                 // TODO NOT IMPLEMENTED YET
                 MainUtil.sendMessage(plr, "NOT IMPLEMENTED YET!!!");
                 return false;
-            }
-            default: {
+            default:
                 noArgs(plr);
                 return false;
-            }
         }
     }
 }
diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Cluster.java b/Core/src/main/java/com/intellectualcrafters/plot/commands/Cluster.java
index f51c9e7e6..42cc84335 100644
--- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Cluster.java
+++ b/Core/src/main/java/com/intellectualcrafters/plot/commands/Cluster.java
@@ -545,7 +545,7 @@ public class Cluster extends SubCommand {
             }
             case "sh":
             case "setspawn":
-            case "sethome": {
+            case "sethome":
                 if (!Permissions.hasPermission(plr, "plots.cluster.sethome")) {
                     MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.cluster.sethome");
                     return false;
@@ -575,7 +575,6 @@ public class Cluster extends SubCommand {
                 cluster.settings.setPosition(blockloc);
                 DBFunc.setPosition(cluster, relative.getX() + "," + relative.getY() + "," + relative.getZ());
                 return MainUtil.sendMessage(plr, C.POSITION_SET);
-            }
         }
         MainUtil.sendMessage(plr, C.CLUSTER_AVAILABLE_ARGS);
         return false;
diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Condense.java b/Core/src/main/java/com/intellectualcrafters/plot/commands/Condense.java
index 8b7458363..44755181a 100644
--- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Condense.java
+++ b/Core/src/main/java/com/intellectualcrafters/plot/commands/Condense.java
@@ -30,7 +30,7 @@ public class Condense extends SubCommand {
 
     @Override
     public boolean onCommand(final PlotPlayer plr, String[] args) {
-        if ((args.length != 2) && (args.length != 3)) {
+        if (args.length != 2 && args.length != 3) {
             MainUtil.sendMessage(plr, "/plot condense <area> <start|stop|info> [radius]");
             return false;
         }
@@ -45,7 +45,7 @@ public class Condense extends SubCommand {
                     MainUtil.sendMessage(plr, "/plot condense " + area.toString() + " start <radius>");
                     return false;
                 }
-                if (TASK) {
+                if (Condense.TASK) {
                     MainUtil.sendMessage(plr, "TASK ALREADY STARTED");
                     return false;
                 }
@@ -91,7 +91,7 @@ public class Condense extends SubCommand {
                     }
                 }
                 int size = allPlots.size();
-                int minimumRadius = (int) Math.ceil((Math.sqrt(size) / 2) + 1);
+                int minimumRadius = (int) Math.ceil(Math.sqrt(size) / 2 + 1);
                 if (radius < minimumRadius) {
                     MainUtil.sendMessage(plr, "RADIUS TOO SMALL");
                     return false;
@@ -99,7 +99,7 @@ public class Condense extends SubCommand {
                 List<PlotId> toMove = new ArrayList<>(getPlots(allPlots, radius));
                 final List<PlotId> free = new ArrayList<>();
                 PlotId start = new PlotId(0, 0);
-                while ((start.x <= minimumRadius) && (start.y <= minimumRadius)) {
+                while (start.x <= minimumRadius && start.y <= minimumRadius) {
                     Plot plot = area.getPlotAbs(start);
                     if (plot != null && !plot.hasOwner()) {
                         free.add(plot.getId());
@@ -114,11 +114,11 @@ public class Condense extends SubCommand {
                 Runnable run = new Runnable() {
                     @Override
                     public void run() {
-                        if (!TASK) {
+                        if (!Condense.TASK) {
                             MainUtil.sendMessage(plr, "TASK CANCELLED.");
                         }
                         if (allPlots.isEmpty()) {
-                            TASK = false;
+                            Condense.TASK = false;
                             MainUtil.sendMessage(plr, "TASK COMPLETE. PLEASE VERIFY THAT NO NEW PLOTS HAVE BEEN CLAIMED DURING TASK.");
                             return;
                         }
@@ -147,7 +147,7 @@ public class Condense extends SubCommand {
                             }
                         }
                         if (free.isEmpty()) {
-                            TASK = false;
+                            Condense.TASK = false;
                             MainUtil.sendMessage(plr, "TASK FAILED. NO FREE PLOTS FOUND!");
                             return;
                         }
@@ -156,20 +156,19 @@ public class Condense extends SubCommand {
                         }
                     }
                 };
-                TASK = true;
+                Condense.TASK = true;
                 TaskManager.runTaskAsync(run);
                 return true;
             }
-            case "stop": {
-                if (!TASK) {
+            case "stop":
+                if (!Condense.TASK) {
                     MainUtil.sendMessage(plr, "TASK ALREADY STOPPED");
                     return false;
                 }
-                TASK = false;
+                Condense.TASK = false;
                 MainUtil.sendMessage(plr, "TASK STOPPED");
                 return true;
-            }
-            case "info": {
+            case "info":
                 if (args.length == 2) {
                     MainUtil.sendMessage(plr, "/plot condense " + area.toString() + " info <radius>");
                     return false;
@@ -181,7 +180,7 @@ public class Condense extends SubCommand {
                 int radius = Integer.parseInt(args[2]);
                 Collection<Plot> plots = area.getPlots();
                 int size = plots.size();
-                int minimumRadius = (int) Math.ceil((Math.sqrt(size) / 2) + 1);
+                int minimumRadius = (int) Math.ceil(Math.sqrt(size) / 2 + 1);
                 if (radius < minimumRadius) {
                     MainUtil.sendMessage(plr, "RADIUS TOO SMALL");
                     return false;
@@ -197,7 +196,6 @@ public class Condense extends SubCommand {
                 MainUtil.sendMessage(plr, "ESTIMATED TIME: " + "No idea, times will drastically change based on the system performance and load");
                 MainUtil.sendMessage(plr, "&e - Radius is measured in plot width");
                 return true;
-            }
         }
         MainUtil.sendMessage(plr, "/plot condense " + area.worldname + " <start|stop|info> [radius]");
         return false;
@@ -206,7 +204,7 @@ public class Condense extends SubCommand {
     public Set<PlotId> getPlots(Collection<Plot> plots, int radius) {
         HashSet<PlotId> outside = new HashSet<>();
         for (Plot plot : plots) {
-            if ((plot.getId().x > radius) || (plot.getId().x < -radius) || (plot.getId().y > radius) || (plot.getId().y < -radius)) {
+            if (plot.getId().x > radius || plot.getId().x < -radius || plot.getId().y > radius || plot.getId().y < -radius) {
                 outside.add(plot.getId());
             }
         }
diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Database.java b/Core/src/main/java/com/intellectualcrafters/plot/commands/Database.java
index 2e372ce1a..3f5756854 100644
--- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Database.java
+++ b/Core/src/main/java/com/intellectualcrafters/plot/commands/Database.java
@@ -78,7 +78,7 @@ public class Database extends SubCommand {
             com.intellectualcrafters.plot.database.Database implementation;
             String prefix = "";
             switch (args[0].toLowerCase()) {
-                case "import": {
+                case "import":
                     if (args.length < 2) {
                         MainUtil.sendMessage(player, "/plot database import [sqlite file] [prefix]");
                         return false;
@@ -90,7 +90,7 @@ public class Database extends SubCommand {
                     }
                     MainUtil.sendMessage(player, "&6Starting...");
                     implementation = new SQLite(file.getPath());
-                    SQLManager manager = new SQLManager(implementation, (args.length == 3) ? args[2] : "", true);
+                    SQLManager manager = new SQLManager(implementation, args.length == 3 ? args[2] : "", true);
                     HashMap<String, HashMap<PlotId, Plot>> map = manager.getPlots();
                     plots = new ArrayList<>();
                     for (Entry<String, HashMap<PlotId, Plot>> entry : map.entrySet()) {
@@ -122,7 +122,6 @@ public class Database extends SubCommand {
                         }
                     });
                     return true;
-                }
                 case "mysql":
                     if (args.length < 6) {
                         return MainUtil.sendMessage(player, "/plot database mysql [host] [port] [username] [password] [database] {prefix}");
@@ -148,7 +147,7 @@ public class Database extends SubCommand {
             }
             try {
                 SQLManager manager = new SQLManager(implementation, prefix, true);
-                insertPlots(manager, plots, player);
+                Database.insertPlots(manager, plots, player);
                 return true;
             } catch (ClassNotFoundException | SQLException e) {
                 MainUtil.sendMessage(player, "$1Failed to save plots, read stacktrace for info");
diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/GenerateDocs.java b/Core/src/main/java/com/intellectualcrafters/plot/commands/GenerateDocs.java
index 47342f66d..53035ddb6 100644
--- a/Core/src/main/java/com/intellectualcrafters/plot/commands/GenerateDocs.java
+++ b/Core/src/main/java/com/intellectualcrafters/plot/commands/GenerateDocs.java
@@ -3,6 +3,7 @@ package com.intellectualcrafters.plot.commands;
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.util.StringMan;
 import com.plotsquared.general.commands.Command;
+
 import java.io.File;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
@@ -18,22 +19,24 @@ public class GenerateDocs {
     public static void main(String[] args) {
         new WE_Anywhere();
         List<Command> commands = MainCommand.getInstance().getCommands();
-        log("### Want to document some commands?");
-        log(" - This page is automatically generated");
-        log(" - Fork the project and add a javadoc comment to one of the command classes");
-        log(" - Then do a pull request and it will be added to this page");
-        log("");
-        log("# Contents");
+        GenerateDocs.log("### Want to document some commands?");
+        GenerateDocs.log(" - This page is automatically generated");
+        GenerateDocs.log(" - Fork the project and add a javadoc comment to one of the command classes");
+        GenerateDocs.log(" - Then do a pull request and it will be added to this page");
+        GenerateDocs.log("");
+        GenerateDocs.log("# Contents");
         for (CommandCategory category : CommandCategory.values()) {
-            log("###### " + category.name());
+            GenerateDocs.log("###### " + category.name());
             for (Command command : MainCommand.getInstance().getCommands(category, null)) {
-                log(" - [/plot " + command.getId() + "](https://github.com/IntellectualSites/PlotSquared/wiki/Commands#" + command.getId() + ")    ");
+                GenerateDocs
+                        .log(" - [/plot " + command.getId() + "](https://github.com/IntellectualSites/PlotSquared/wiki/Commands#" + command.getId()
+                                + ")    ");
             }
-            log("");
+            GenerateDocs.log("");
         }
-        log("# Commands");
+        GenerateDocs.log("# Commands");
         for (Command command : commands) {
-            printCommand(command);
+            GenerateDocs.printCommand(command);
         }
     }
 
@@ -46,62 +49,60 @@ public class GenerateDocs {
             String source =
                     "https://github.com/IntellectualSites/PlotSquared/tree/master/Core/src/main/java/com/intellectualcrafters/plot/commands/" + clazz
                             + ".java";
-            log("## [" + name.toUpperCase() + "](" + source + ")    ");
+            GenerateDocs.log("## [" + name.toUpperCase() + "](" + source + ")    ");
 
             File file = new File("Core/src/main/java/com/intellectualcrafters/plot/commands/" + clazz + ".java");
             List<String> lines = Files.readAllLines(file.toPath(), StandardCharsets.UTF_8);
-            List<String> perms = getPerms(name, lines);
-            List<String> usages = getUsage(name, lines);
-            String comment = getComments(lines);
+            List<String> perms = GenerateDocs.getPerms(name, lines);
+            List<String> usages = GenerateDocs.getUsage(name, lines);
+            String comment = GenerateDocs.getComments(lines);
 
-            log("#### Description");
-            log("`" + command.getDescription() + "`");
+            GenerateDocs.log("#### Description");
+            GenerateDocs.log("`" + command.getDescription() + "`");
             if (!comment.isEmpty()) {
-                log("##### Comments");
-                log("``` java");
-                log(comment);
-                log("```");
+                GenerateDocs.log("##### Comments");
+                GenerateDocs.log("``` java");
+                GenerateDocs.log(comment);
+                GenerateDocs.log("```");
             }
 
-            log("#### Usage    ");
-            {
-                String mainUsage = command.getUsage().replaceAll("\\{label\\}", "plot");
-                if (!usages.isEmpty() && !usages.get(0).equalsIgnoreCase(mainUsage)) {
-                    log("##### Primary    ");
-                    log(" - `" + mainUsage + "`    ");
-                    log("");
-                    log("##### Other    ");
-                    log(" - `" + StringMan.join(usages, "`\n - `") + "`    ");
-                    log("");
-                } else {
-                    log("`" + mainUsage + "`    ");
-                }
+            GenerateDocs.log("#### Usage    ");
+            String mainUsage = command.getUsage().replaceAll("\\{label\\}", "plot");
+            if (!usages.isEmpty() && !usages.get(0).equalsIgnoreCase(mainUsage)) {
+                GenerateDocs.log("##### Primary    ");
+                GenerateDocs.log(" - `" + mainUsage + "`    ");
+                GenerateDocs.log("");
+                GenerateDocs.log("##### Other    ");
+                GenerateDocs.log(" - `" + StringMan.join(usages, "`\n - `") + "`    ");
+                GenerateDocs.log("");
+            } else {
+                GenerateDocs.log("`" + mainUsage + "`    ");
             }
 
             if (command.getRequiredType() != RequiredType.NONE) {
-                log("#### Required callers");
-                log("`" + command.getRequiredType().name() + "`");
+                GenerateDocs.log("#### Required callers");
+                GenerateDocs.log("`" + command.getRequiredType().name() + "`");
             }
 
             List<String> aliases = command.getAliases();
             if (!aliases.isEmpty()) {
-                log("#### Aliases");
-                log("`" + StringMan.getString(command.getAliases()) + "`");
+                GenerateDocs.log("#### Aliases");
+                GenerateDocs.log("`" + StringMan.getString(command.getAliases()) + "`");
             }
 
-            log("#### Permissions");
+            GenerateDocs.log("#### Permissions");
             if (!perms.isEmpty()) {
-                log("##### Primary");
-                log(" - `" + command.getPermission() + "`    ");
-                log("");
-                log("##### Other");
-                log(" - `" + StringMan.join(perms, "`\n - `") + "`");
-                log("");
+                GenerateDocs.log("##### Primary");
+                GenerateDocs.log(" - `" + command.getPermission() + "`    ");
+                GenerateDocs.log("");
+                GenerateDocs.log("##### Other");
+                GenerateDocs.log(" - `" + StringMan.join(perms, "`\n - `") + "`");
+                GenerateDocs.log("");
             } else {
-                log("`" + command.getPermission() + "`    ");
+                GenerateDocs.log("`" + command.getPermission() + "`    ");
             }
-            log("***");
-            log("");
+            GenerateDocs.log("***");
+            GenerateDocs.log("");
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -189,10 +190,9 @@ public class GenerateDocs {
         }
         switch (cmd.toLowerCase()) {
             case "auto":
-            case "claim": {
+            case "claim":
                 perms.add("plots.plot.<#>");
                 break;
-            }
         }
         return new ArrayList<>(perms);
     }
diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Help.java b/Core/src/main/java/com/intellectualcrafters/plot/commands/Help.java
index f8b3e24a1..0ee202188 100644
--- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Help.java
+++ b/Core/src/main/java/com/intellectualcrafters/plot/commands/Help.java
@@ -30,11 +30,10 @@ public class Help extends Command {
     @Override
     public void execute(PlotPlayer player, String[] args, RunnableVal3<Command, Runnable, Runnable> confirm, RunnableVal2<Command, CommandResult> whenDone) {
         switch (args.length) {
-            case 0: {
+            case 0:
                 displayHelp(player, null, 0);
                 return;
-            }
-            case 1: {
+            case 1:
                 if (MathMan.isInteger(args[0])) {
                     try {
                         displayHelp(player, null, Integer.parseInt(args[0]));
@@ -45,8 +44,7 @@ public class Help extends Command {
                     displayHelp(player, args[0], 1);
                 }
                 return;
-            }
-            case 2: {
+            case 2:
                 if (MathMan.isInteger(args[1])) {
                     try {
                         displayHelp(player, args[1], Integer.parseInt(args[1]));
@@ -55,10 +53,8 @@ public class Help extends Command {
                     }
                 }
                 return;
-            }
-            default: {
+            default:
                 C.COMMAND_SYNTAX.send(player, getUsage());
-            }
         }
     }
 
diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Inbox.java b/Core/src/main/java/com/intellectualcrafters/plot/commands/Inbox.java
index c99ca1404..2c90058ab 100644
--- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Inbox.java
+++ b/Core/src/main/java/com/intellectualcrafters/plot/commands/Inbox.java
@@ -10,6 +10,7 @@ import com.intellectualcrafters.plot.util.CommentManager;
 import com.intellectualcrafters.plot.util.MainUtil;
 import com.intellectualcrafters.plot.util.StringMan;
 import com.plotsquared.general.commands.CommandDeclaration;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -23,7 +24,7 @@ import java.util.List;
 public class Inbox extends SubCommand {
 
     public void displayComments(PlotPlayer player, List<PlotComment> oldComments, int page) {
-        if ((oldComments == null) || oldComments.isEmpty()) {
+        if (oldComments == null || oldComments.isEmpty()) {
             MainUtil.sendMessage(player, C.INBOX_EMPTY);
             return;
         }
@@ -38,7 +39,7 @@ public class Inbox extends SubCommand {
             page = totalPages;
         }
         // Only display 12 per page
-        int max = (page * 12) + 12;
+        int max = page * 12 + 12;
         if (max > comments.length) {
             max = comments.length;
         }
@@ -112,7 +113,7 @@ public class Inbox extends SubCommand {
         final int page;
         if (args.length > 1) {
             switch (args[1].toLowerCase()) {
-                case "delete": {
+                case "delete":
                     if (!inbox.canModify(plot, player)) {
                         sendMessage(player, C.NO_PERM_INBOX_MODIFY);
                         return false;
@@ -149,8 +150,7 @@ public class Inbox extends SubCommand {
                         return false;
                     }
                     return true;
-                }
-                case "clear": {
+                case "clear":
                     if (!inbox.canModify(plot, player)) {
                         sendMessage(player, C.NO_PERM_INBOX_MODIFY);
                     }
@@ -161,15 +161,13 @@ public class Inbox extends SubCommand {
                     }
                     MainUtil.sendMessage(player, C.COMMENT_REMOVED, "*");
                     return true;
-                }
-                default: {
+                default:
                     try {
                         page = Integer.parseInt(args[1]);
                     } catch (NumberFormatException e) {
                         sendMessage(player, C.COMMAND_SYNTAX, "/plot inbox [inbox] [delete <index>|clear|page]");
                         return false;
                     }
-                }
             }
         } else {
             page = 1;
diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Info.java b/Core/src/main/java/com/intellectualcrafters/plot/commands/Info.java
index 3a7fee08a..45b10e096 100644
--- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Info.java
+++ b/Core/src/main/java/com/intellectualcrafters/plot/commands/Info.java
@@ -66,7 +66,7 @@ public class Info extends SubCommand {
                 args = new String[]{args[1]};
             }
         }
-        if ((args.length == 1) && args[0].equalsIgnoreCase("inv")) {
+        if (args.length == 1 && args[0].equalsIgnoreCase("inv")) {
             PlotInventory inv = new PlotInventory(player) {
                 @Override
                 public boolean onClick(int index) {
@@ -95,13 +95,9 @@ public class Info extends SubCommand {
             return true;
         }
         boolean hasOwner = plot.hasOwner();
-        boolean containsEveryone;
-        boolean trustedEveryone;
         // Wildcard player {added}
-        {
-            containsEveryone = plot.getTrusted().contains(DBFunc.everyone);
-            trustedEveryone = plot.getMembers().contains(DBFunc.everyone);
-        }
+        boolean containsEveryone = plot.getTrusted().contains(DBFunc.everyone);
+        boolean trustedEveryone = plot.getMembers().contains(DBFunc.everyone);
         // Unclaimed?
         if (!hasOwner && !containsEveryone && !trustedEveryone) {
             MainUtil.sendMessage(player, C.PLOT_INFO_UNCLAIMED, plot.getId().x + ";" + plot.getId().y);
diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/ListCmd.java b/Core/src/main/java/com/intellectualcrafters/plot/commands/ListCmd.java
index f4ef0e88f..441217d27 100644
--- a/Core/src/main/java/com/intellectualcrafters/plot/commands/ListCmd.java
+++ b/Core/src/main/java/com/intellectualcrafters/plot/commands/ListCmd.java
@@ -26,6 +26,7 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map.Entry;
 import java.util.UUID;
 
@@ -39,8 +40,8 @@ import java.util.UUID;
 public class ListCmd extends SubCommand {
 
     private String[] getArgumentList(PlotPlayer player) {
-        java.util.List<String> args = new ArrayList<>();
-        if ((EconHandler.manager != null) && Permissions.hasPermission(player, "plots.list.forsale")) {
+        List<String> args = new ArrayList<>();
+        if (EconHandler.manager != null && Permissions.hasPermission(player, "plots.list.forsale")) {
             args.add("forsale");
         }
         if (Permissions.hasPermission(player, "plots.list.mine")) {
@@ -105,14 +106,14 @@ public class ListCmd extends SubCommand {
             }
         }
 
-        java.util.List<Plot> plots = null;
+        List<Plot> plots = null;
 
         String world = plr.getLocation().getWorld();
         PlotArea area = plr.getApplicablePlotArea();
         String arg = args[0].toLowerCase();
         boolean sort = true;
         switch (arg) {
-            case "mine": {
+            case "mine":
                 if (!Permissions.hasPermission(plr, "plots.list.mine")) {
                     MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.list.mine");
                     return false;
@@ -120,8 +121,7 @@ public class ListCmd extends SubCommand {
                 sort = false;
                 plots = PS.get().sortPlotsByTemp(PS.get().getBasePlots(plr));
                 break;
-            }
-            case "shared": {
+            case "shared":
                 if (!Permissions.hasPermission(plr, "plots.list.shared")) {
                     MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.list.shared");
                     return false;
@@ -133,8 +133,7 @@ public class ListCmd extends SubCommand {
                     }
                 }
                 break;
-            }
-            case "world": {
+            case "world":
                 if (!Permissions.hasPermission(plr, "plots.list.world")) {
                     MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.list.world");
                     return false;
@@ -145,16 +144,14 @@ public class ListCmd extends SubCommand {
                 }
                 plots = new ArrayList<>(PS.get().getPlots(world));
                 break;
-            }
-            case "expired": {
+            case "expired":
                 if (!Permissions.hasPermission(plr, "plots.list.expired")) {
                     MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.list.expired");
                     return false;
                 }
                 plots = ExpireManager.IMP == null ? new ArrayList<Plot>() : new ArrayList<>(ExpireManager.IMP.getPendingExpired());
                 break;
-            }
-            case "area": {
+            case "area":
                 if (!Permissions.hasPermission(plr, "plots.list.area")) {
                     MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.list.area");
                     return false;
@@ -165,16 +162,14 @@ public class ListCmd extends SubCommand {
                 }
                 plots = area == null ? new ArrayList<Plot>() : new ArrayList<>(area.getPlots());
                 break;
-            }
-            case "all": {
+            case "all":
                 if (!Permissions.hasPermission(plr, "plots.list.all")) {
                     MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.list.all");
                     return false;
                 }
                 plots = new ArrayList<>(PS.get().getPlots());
                 break;
-            }
-            case "done": {
+            case "done":
                 if (!Permissions.hasPermission(plr, "plots.list.done")) {
                     MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.list.done");
                     return false;
@@ -203,8 +198,7 @@ public class ListCmd extends SubCommand {
                 });
                 sort = false;
                 break;
-            }
-            case "top": {
+            case "top":
                 if (!Permissions.hasPermission(plr, "plots.list.top")) {
                     MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.list.top");
                     return false;
@@ -233,7 +227,7 @@ public class ListCmd extends SubCommand {
                             v2 /= p2s;
                             v2 += p2s;
                         }
-                        if ((v2 == v1) && (v2 != 0)) {
+                        if (v2 == v1 && v2 != 0) {
                             return p2s - p1s;
                         }
                         return (int) Math.signum(v2 - v1);
@@ -241,8 +235,7 @@ public class ListCmd extends SubCommand {
                 });
                 sort = false;
                 break;
-            }
-            case "forsale": {
+            case "forsale":
                 if (!Permissions.hasPermission(plr, "plots.list.forsale")) {
                     MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.list.forsale");
                     return false;
@@ -258,8 +251,7 @@ public class ListCmd extends SubCommand {
                     }
                 }
                 break;
-            }
-            case "unowned": {
+            case "unowned":
                 if (!Permissions.hasPermission(plr, "plots.list.unowned")) {
                     MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.list.unowned");
                     return false;
@@ -271,8 +263,7 @@ public class ListCmd extends SubCommand {
                     }
                 }
                 break;
-            }
-            case "unknown": {
+            case "unknown":
                 if (!Permissions.hasPermission(plr, "plots.list.unknown")) {
                     MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.list.unknown");
                     return false;
@@ -287,8 +278,7 @@ public class ListCmd extends SubCommand {
                     }
                 }
                 break;
-            }
-            case "fuzzy": {
+            case "fuzzy":
                 if (!Permissions.hasPermission(plr, "plots.list.fuzzy")) {
                     MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.list.fuzzy");
                     return false;
@@ -301,8 +291,7 @@ public class ListCmd extends SubCommand {
                 plots = MainUtil.getPlotsBySearch(term);
                 sort = false;
                 break;
-            }
-            default: {
+            default:
                 if (PS.get().hasPlotArea(args[0])) {
                     if (!Permissions.hasPermission(plr, "plots.list.world")) {
                         MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.list.world");
@@ -331,7 +320,6 @@ public class ListCmd extends SubCommand {
                     plots = PS.get().sortPlotsByTemp(PS.get().getPlots(uuid));
                     break;
                 }
-            }
         }
 
         if (plots == null) {
@@ -347,7 +335,7 @@ public class ListCmd extends SubCommand {
         return true;
     }
 
-    public void displayPlots(final PlotPlayer player, java.util.List<Plot> plots, int pageSize, int page, PlotArea area,
+    public void displayPlots(final PlotPlayer player, List<Plot> plots, int pageSize, int page, PlotArea area,
             String[] args, boolean sort) {
         // Header
         Iterator<Plot> iterator = plots.iterator();
diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Purge.java b/Core/src/main/java/com/intellectualcrafters/plot/commands/Purge.java
index 6d61f38ef..3d9c482c8 100644
--- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Purge.java
+++ b/Core/src/main/java/com/intellectualcrafters/plot/commands/Purge.java
@@ -47,52 +47,46 @@ public class Purge extends SubCommand {
             }
             switch (split[0].toLowerCase()) {
                 case "world":
-                case "w": {
+                case "w":
                     world = split[1];
                     break;
-                }
                 case "area":
-                case "a": {
+                case "a":
                     area = PS.get().getPlotAreaByString(split[1]);
                     if (area == null) {
                         C.NOT_VALID_PLOT_WORLD.send(plr, split[1]);
                         return false;
                     }
                     break;
-                }
                 case "plotid":
-                case "id": {
+                case "id":
                     id = PlotId.fromString(split[1]);
                     if (id == null) {
                         C.NOT_VALID_PLOT_ID.send(plr, split[1]);
                         return false;
                     }
                     break;
-                }
                 case "owner":
-                case "o": {
+                case "o":
                     owner = UUIDHandler.getUUID(split[1], null);
                     if (owner == null) {
                         C.INVALID_PLAYER.send(plr, split[1]);
                         return false;
                     }
                     break;
-                }
                 case "shared":
-                case "s": {
+                case "s":
                     added = UUIDHandler.getUUID(split[1], null);
                     if (added == null) {
                         C.INVALID_PLAYER.send(plr, split[1]);
                         return false;
                     }
                     break;
-                }
                 case "unknown":
                 case "?":
-                case "u": {
+                case "u":
                     unknown = Boolean.parseBoolean(split[1]);
                     break;
-                }
             }
         }
         final HashSet<Plot> toDelete = new HashSet<>();
diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Rate.java b/Core/src/main/java/com/intellectualcrafters/plot/commands/Rate.java
index 9d6c13c0d..eb5070158 100644
--- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Rate.java
+++ b/Core/src/main/java/com/intellectualcrafters/plot/commands/Rate.java
@@ -16,6 +16,7 @@ import com.intellectualcrafters.plot.util.Permissions;
 import com.intellectualcrafters.plot.util.TaskManager;
 import com.plotsquared.general.commands.Command;
 import com.plotsquared.general.commands.CommandDeclaration;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -87,7 +88,7 @@ public class Rate extends SubCommand {
             sendMessage(player, C.RATING_NOT_DONE);
             return false;
         }
-        if ((Settings.RATING_CATEGORIES != null) && !Settings.RATING_CATEGORIES.isEmpty()) {
+        if (Settings.RATING_CATEGORIES != null && !Settings.RATING_CATEGORIES.isEmpty()) {
             final Runnable run = new Runnable() {
                 @Override
                 public void run() {
@@ -154,7 +155,7 @@ public class Rate extends SubCommand {
         }
         String arg = args[0];
         final int rating;
-        if (MathMan.isInteger(arg) && (arg.length() < 3) && !arg.isEmpty()) {
+        if (MathMan.isInteger(arg) && arg.length() < 3 && !arg.isEmpty()) {
             rating = Integer.parseInt(arg);
             if (rating > 10 || rating < 1) {
                 sendMessage(player, C.RATING_NOT_VALID);
diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Remove.java b/Core/src/main/java/com/intellectualcrafters/plot/commands/Remove.java
index c5c85050e..042195d8a 100644
--- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Remove.java
+++ b/Core/src/main/java/com/intellectualcrafters/plot/commands/Remove.java
@@ -9,6 +9,7 @@ import com.intellectualcrafters.plot.util.Permissions;
 import com.intellectualcrafters.plot.util.UUIDHandler;
 import com.plotsquared.general.commands.Argument;
 import com.plotsquared.general.commands.CommandDeclaration;
+
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.UUID;
@@ -63,7 +64,7 @@ public class Remove extends SubCommand {
                 }
                 break;
             }
-            case "*": {
+            case "*":
                 ArrayList<UUID> toRemove = new ArrayList<>();
                 HashSet<UUID> all = new HashSet<>();
                 all.addAll(plot.getMembers());
@@ -79,7 +80,6 @@ public class Remove extends SubCommand {
                     plot.removeMember(uuid);
                 }
                 break;
-            }
             default:
                 UUID uuid = UUIDHandler.getUUID(args[0], null);
                 if (uuid != null) {
diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/SchematicCmd.java b/Core/src/main/java/com/intellectualcrafters/plot/commands/SchematicCmd.java
index 08e8baaf8..ba5bc8363 100644
--- a/Core/src/main/java/com/intellectualcrafters/plot/commands/SchematicCmd.java
+++ b/Core/src/main/java/com/intellectualcrafters/plot/commands/SchematicCmd.java
@@ -15,6 +15,7 @@ import com.intellectualcrafters.plot.util.SchematicHandler;
 import com.intellectualcrafters.plot.util.SchematicHandler.Schematic;
 import com.intellectualcrafters.plot.util.TaskManager;
 import com.plotsquared.general.commands.CommandDeclaration;
+
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -174,7 +175,7 @@ public class SchematicCmd extends SubCommand {
                 break;
             }
             case "export":
-            case "save": {
+            case "save":
                 if (!Permissions.hasPermission(plr, "plots.schematic.save")) {
                     MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.schematic.save");
                     return false;
@@ -214,11 +215,9 @@ public class SchematicCmd extends SubCommand {
                     MainUtil.sendMessage(plr, "&7Starting export...");
                 }
                 break;
-            }
-            default: {
+            default:
                 sendMessage(plr, C.SCHEMATIC_MISSING_ARG);
                 break;
-            }
         }
         return true;
     }
diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Set.java b/Core/src/main/java/com/intellectualcrafters/plot/commands/Set.java
index f64427b95..d870f98cf 100644
--- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Set.java
+++ b/Core/src/main/java/com/intellectualcrafters/plot/commands/Set.java
@@ -17,6 +17,7 @@ import com.intellectualcrafters.plot.util.StringMan;
 import com.intellectualcrafters.plot.util.WorldUtil;
 import com.plotsquared.general.commands.Command;
 import com.plotsquared.general.commands.CommandDeclaration;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
@@ -159,23 +160,21 @@ public class Set extends SubCommand {
             return this.component.onCommand(plr, Arrays.copyOfRange(args, 0, args.length));
         }
         // flag
-        {
-            AbstractFlag af;
-            try {
-                af = new AbstractFlag(args[0].toLowerCase());
-            } catch (Exception e) {
-                af = new AbstractFlag("");
-            }
-            if (FlagManager.getFlags().contains(af)) {
-                StringBuilder a = new StringBuilder();
-                if (args.length > 1) {
-                    for (int x = 1; x < args.length; x++) {
-                        a.append(" ").append(args[x]);
-                    }
+        AbstractFlag af;
+        try {
+            af = new AbstractFlag(args[0].toLowerCase());
+        } catch (Exception e) {
+            af = new AbstractFlag("");
+        }
+        if (FlagManager.getFlags().contains(af)) {
+            StringBuilder a = new StringBuilder();
+            if (args.length > 1) {
+                for (int x = 1; x < args.length; x++) {
+                    a.append(" ").append(args[x]);
                 }
-                MainCommand.onCommand(plr, ("flag set " + args[0] + a.toString()).split(" "));
-                return true;
             }
+            MainCommand.onCommand(plr, ("flag set " + args[0] + a.toString()).split(" "));
+            return true;
         }
         return noArgs(plr);
     }
diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/SetHome.java b/Core/src/main/java/com/intellectualcrafters/plot/commands/SetHome.java
index 33e3c7340..42402de01 100644
--- a/Core/src/main/java/com/intellectualcrafters/plot/commands/SetHome.java
+++ b/Core/src/main/java/com/intellectualcrafters/plot/commands/SetHome.java
@@ -28,18 +28,16 @@ public class SetHome extends SetCommand {
                 base.setHome(null);
                 return MainUtil.sendMessage(plr, C.POSITION_UNSET);
             }
-            case "": {
+            case "":
                 Plot base = plot.getBasePlot(false);
                 Location bot = base.getBottomAbs();
                 Location loc = plr.getLocationFull();
                 BlockLoc rel = new BlockLoc(loc.getX() - bot.getX(), loc.getY(), loc.getZ() - bot.getZ(), loc.getYaw(), loc.getPitch());
                 base.setHome(rel);
                 return MainUtil.sendMessage(plr, C.POSITION_SET);
-            }
-            default: {
+            default:
                 MainUtil.sendMessage(plr, C.HOME_ARGUMENT);
                 return false;
-            }
         }
     }
 }
diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Setup.java b/Core/src/main/java/com/intellectualcrafters/plot/commands/Setup.java
index f7c493dee..3bf60ce82 100644
--- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Setup.java
+++ b/Core/src/main/java/com/intellectualcrafters/plot/commands/Setup.java
@@ -75,8 +75,8 @@ public class Setup extends SubCommand {
         }
         int index = object.current;
         switch (index) {
-            case 0: { // choose generator
-                if ((args.length != 1) || !SetupUtils.generators.containsKey(args[0])) {
+            case 0:  // choose generator
+                if (args.length != 1 || !SetupUtils.generators.containsKey(args[0])) {
                     String prefix = "\n&8 - &7";
                     MainUtil.sendMessage(plr, "&cYou must choose a generator!" + prefix + StringMan.join(SetupUtils.generators.keySet(), prefix)
                             .replaceAll("PlotSquared", "&2PlotSquared"));
@@ -89,8 +89,7 @@ public class Setup extends SubCommand {
                 MainUtil.sendMessage(plr, "&6What world type do you want?" + "\n&8 - &2DEFAULT&8 - &7Standard plot generation"
                         + "\n&8 - &7AUGMENTED&8 - &7Plot generation with terrain" + partial);
                 break;
-            }
-            case 1: { // choose world type
+            case 1:  // choose world type
                 List<String> allTypes = Arrays.asList("default", "augmented", "partial");
                 List<String> allDesc = Arrays.asList("Standard plot generation", "Plot generation with vanilla terrain",
                         "Vanilla with clusters of plots");
@@ -100,7 +99,7 @@ public class Setup extends SubCommand {
                 }
                 types.add("augmented");
                 types.add("partial");
-                if ((args.length != 1) || !types.contains(args[0].toLowerCase())) {
+                if (args.length != 1 || !types.contains(args[0].toLowerCase())) {
                     MainUtil.sendMessage(plr, "&cYou must choose a world type!");
                     for (String type : types) {
                         int i = allTypes.indexOf(type);
@@ -157,8 +156,7 @@ public class Setup extends SubCommand {
                     }
                 }
                 break;
-            }
-            case 2: { // area id
+            case 2:  // area id
                 if (!StringMan.isAlphanumericUnd(args[0])) {
                     MainUtil.sendMessage(plr, "&cThe area id must be alphanumerical!");
                     return false;
@@ -173,8 +171,7 @@ public class Setup extends SubCommand {
                 object.current++;
                 MainUtil.sendMessage(plr, "&6What should be the minimum Plot Id?");
                 break;
-            }
-            case 3: { // min
+            case 3:  // min
                 object.min = PlotId.fromString(args[0]);
                 if (object.min == null) {
                     MainUtil.sendMessage(plr, "&cYou must choose a valid minimum PlotId!");
@@ -183,8 +180,7 @@ public class Setup extends SubCommand {
                 object.current++;
                 MainUtil.sendMessage(plr, "&6What should be the maximum Plot Id?");
                 break;
-            }
-            case 4: {
+            case 4:
                 // max
                 PlotId id = PlotId.fromString(args[0]);
                 if (id == null) {
@@ -203,10 +199,9 @@ public class Setup extends SubCommand {
                         + "\n&8 - &7ROAD&8 - &7Terrain separated by roads"
                         + "\n&8 - &7ALL&8 - &7Entirely vanilla generation");
                 break;
-            }
             case 5: { // Choose terrain
                 List<String> terrain = Arrays.asList("none", "ore", "road", "all");
-                if ((args.length != 1) || !terrain.contains(args[0].toLowerCase())) {
+                if (args.length != 1 || !terrain.contains(args[0].toLowerCase())) {
                     MainUtil.sendMessage(plr, "&cYou must choose the terrain!"
                             + "\n&8 - &2NONE&8 - &7No terrain at all"
                             + "\n&8 - &7ORE&8 - &7Just some ore veins and trees"
@@ -225,7 +220,7 @@ public class Setup extends SubCommand {
                         step.getDefaultValue() + "");
                 break;
             }
-            case 6: { // world setup
+            case 6:  // world setup
                 if (object.setup_index == object.step.length) {
                     MainUtil.sendMessage(plr, "&6What do you want your world to be called?");
                     object.setup_index = 0;
@@ -257,8 +252,7 @@ public class Setup extends SubCommand {
                             step.getDefaultValue() + "");
                     return false;
                 }
-            }
-            case 7: {
+            case 7:
                 if (args.length != 1) {
                     MainUtil.sendMessage(plr, "&cYou need to choose a world name!");
                     return false;
@@ -287,7 +281,6 @@ public class Setup extends SubCommand {
                     e.printStackTrace();
                 }
                 sendMessage(plr, C.SETUP_FINISHED, object.world);
-            }
         }
         return false;
     }
diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Visit.java b/Core/src/main/java/com/intellectualcrafters/plot/commands/Visit.java
index b751eae1b..c00b20a34 100644
--- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Visit.java
+++ b/Core/src/main/java/com/intellectualcrafters/plot/commands/Visit.java
@@ -45,15 +45,14 @@ public class Visit extends SubCommand {
         int page = Integer.MIN_VALUE;
         Collection<Plot> unsorted = null;
         switch (args.length) {
-            case 2: {
+            case 2:
                 if (!MathMan.isInteger(args[1])) {
                     sendMessage(player, C.NOT_VALID_NUMBER, "(1, ∞)");
                     sendMessage(player, C.COMMAND_SYNTAX, "/plot visit " + args[0] + " [#]");
                     return false;
                 }
                 page = Integer.parseInt(args[1]);
-            }
-            case 1: {
+            case 1:
                 UUID user = UUIDHandler.getCachedUUID(args[0], null);
                 if (page == Integer.MIN_VALUE && user == null && MathMan.isInteger(args[0])) {
                     page = Integer.parseInt(args[0]);
@@ -69,15 +68,12 @@ public class Visit extends SubCommand {
                     }
                 }
                 break;
-            }
-            case 0: {
+            case 0:
                 page = 1;
                 unsorted = PS.get().getPlots(player);
                 break;
-            }
-            default: {
+            default:
 
-            }
         }
         if (page == Integer.MIN_VALUE) {
             page = 1;
diff --git a/Core/src/main/java/com/intellectualcrafters/plot/database/DBFunc.java b/Core/src/main/java/com/intellectualcrafters/plot/database/DBFunc.java
index 24d2e53d0..a9ead64b5 100644
--- a/Core/src/main/java/com/intellectualcrafters/plot/database/DBFunc.java
+++ b/Core/src/main/java/com/intellectualcrafters/plot/database/DBFunc.java
@@ -33,14 +33,14 @@ public class DBFunc {
     public static AbstractDB dbManager;
 
     public static void movePlot(Plot originalPlot, Plot newPlot) {
-        if ((originalPlot.temp == -1) || (newPlot.temp == -1)) {
+        if (originalPlot.temp == -1 || newPlot.temp == -1) {
             return;
         }
-        dbManager.movePlot(originalPlot, newPlot);
+        DBFunc.dbManager.movePlot(originalPlot, newPlot);
     }
 
     public static void validatePlots(Set<Plot> plots) {
-        dbManager.validateAllPlots(plots);
+        DBFunc.dbManager.validateAllPlots(plots);
     }
     
     /**
@@ -74,7 +74,7 @@ public class DBFunc {
         if (plot.temp == -1) {
             return;
         }
-        dbManager.setOwner(plot, uuid);
+        DBFunc.dbManager.setOwner(plot, uuid);
     }
     
     /**
@@ -83,7 +83,7 @@ public class DBFunc {
      * @param plots List containing all plot objects
      */
     public static void createPlotsAndData(ArrayList<Plot> plots, Runnable whenDone) {
-        dbManager.createPlotsAndData(plots, whenDone);
+        DBFunc.dbManager.createPlotsAndData(plots, whenDone);
     }
     
     /**
@@ -95,7 +95,7 @@ public class DBFunc {
         if (plot.temp == -1) {
             return;
         }
-        dbManager.createPlot(plot);
+        DBFunc.dbManager.createPlot(plot);
     }
     
     /**
@@ -107,7 +107,7 @@ public class DBFunc {
         if (plot.temp == -1) {
             return;
         }
-        dbManager.createPlotAndSettings(plot, whenDone);
+        DBFunc.dbManager.createPlotAndSettings(plot, whenDone);
     }
     
     /**
@@ -116,7 +116,7 @@ public class DBFunc {
      * @throws Exception
      */
     public static void createTables(String database) throws Exception {
-        dbManager.createTables();
+        DBFunc.dbManager.createTables();
     }
     
     /**
@@ -128,7 +128,7 @@ public class DBFunc {
         if (plot.temp == -1) {
             return;
         }
-        dbManager.delete(plot);
+        DBFunc.dbManager.delete(plot);
         plot.temp = -1;
     }
     
@@ -140,7 +140,7 @@ public class DBFunc {
         if (plot.temp == -1) {
             return;
         }
-        dbManager.deleteRatings(plot);
+        DBFunc.dbManager.deleteRatings(plot);
     }
     
     /**
@@ -151,7 +151,7 @@ public class DBFunc {
         if (plot.temp == -1) {
             return;
         }
-        dbManager.deleteHelpers(plot);
+        DBFunc.dbManager.deleteHelpers(plot);
     }
     
     /**
@@ -162,7 +162,7 @@ public class DBFunc {
         if (plot.temp == -1) {
             return;
         }
-        dbManager.deleteTrusted(plot);
+        DBFunc.dbManager.deleteTrusted(plot);
     }
     
     /**
@@ -173,7 +173,7 @@ public class DBFunc {
         if (plot.temp == -1) {
             return;
         }
-        dbManager.deleteDenied(plot);
+        DBFunc.dbManager.deleteDenied(plot);
     }
     
     /**
@@ -184,7 +184,7 @@ public class DBFunc {
         if (plot.temp == -1) {
             return;
         }
-        dbManager.deleteComments(plot);
+        DBFunc.dbManager.deleteComments(plot);
     }
     
     /**
@@ -199,11 +199,11 @@ public class DBFunc {
         if (plot.temp == -1) {
             return;
         }
-        dbManager.deleteSettings(plot);
+        DBFunc.dbManager.deleteSettings(plot);
     }
 
     public static void delete(PlotCluster toDelete) {
-        dbManager.delete(toDelete);
+        DBFunc.dbManager.delete(toDelete);
     }
     
     /**
@@ -216,7 +216,7 @@ public class DBFunc {
         if (plot.temp == -1) {
             return;
         }
-        dbManager.createPlotSettings(id, plot);
+        DBFunc.dbManager.createPlotSettings(id, plot);
     }
     
     /**
@@ -227,32 +227,32 @@ public class DBFunc {
      * @return ID
      */
     public static int getId(Plot plot) {
-        return dbManager.getId(plot);
+        return DBFunc.dbManager.getId(plot);
     }
     
     /**
      * @return Plots
      */
     public static HashMap<String, HashMap<PlotId, Plot>> getPlots() {
-        return dbManager.getPlots();
+        return DBFunc.dbManager.getPlots();
     }
 
     public static void setMerged(Plot plot, boolean[] merged) {
         if (plot.temp == -1) {
             return;
         }
-        dbManager.setMerged(plot, merged);
+        DBFunc.dbManager.setMerged(plot, merged);
     }
 
     public static void setFlags(Plot plot, Collection<Flag> flags) {
         if (plot.temp == -1) {
             return;
         }
-        dbManager.setFlags(plot, flags);
+        DBFunc.dbManager.setFlags(plot, flags);
     }
 
     public static void setFlags(PlotCluster cluster, Collection<Flag> flags) {
-        dbManager.setFlags(cluster, flags);
+        DBFunc.dbManager.setFlags(cluster, flags);
     }
     
     /**
@@ -263,15 +263,15 @@ public class DBFunc {
         if (plot.temp == -1) {
             return;
         }
-        dbManager.setAlias(plot, alias);
+        DBFunc.dbManager.setAlias(plot, alias);
     }
 
     public static void purgeIds(Set<Integer> uniqueIds) {
-        dbManager.purgeIds(uniqueIds);
+        DBFunc.dbManager.purgeIds(uniqueIds);
     }
 
     public static void purge(PlotArea area, Set<PlotId> plotIds) {
-        dbManager.purge(area, plotIds);
+        DBFunc.dbManager.purge(area, plotIds);
     }
     
     /**
@@ -282,7 +282,7 @@ public class DBFunc {
         if (plot.temp == -1) {
             return;
         }
-        dbManager.setPosition(plot, position);
+        DBFunc.dbManager.setPosition(plot, position);
     }
     
     /**
@@ -290,17 +290,17 @@ public class DBFunc {
      * @param comment
      */
     public static void removeComment(Plot plot, PlotComment comment) {
-        if ((plot != null) && (plot.temp == -1)) {
+        if (plot != null && plot.temp == -1) {
             return;
         }
-        dbManager.removeComment(plot, comment);
+        DBFunc.dbManager.removeComment(plot, comment);
     }
 
     public static void clearInbox(Plot plot, String inbox) {
-        if ((plot != null) && (plot.temp == -1)) {
+        if (plot != null && plot.temp == -1) {
             return;
         }
-        dbManager.clearInbox(plot, inbox);
+        DBFunc.dbManager.clearInbox(plot, inbox);
     }
     
     /**
@@ -308,20 +308,20 @@ public class DBFunc {
      * @param comment
      */
     public static void setComment(Plot plot, PlotComment comment) {
-        if ((plot != null) && (plot.temp == -1)) {
+        if (plot != null && plot.temp == -1) {
             return;
         }
-        dbManager.setComment(plot, comment);
+        DBFunc.dbManager.setComment(plot, comment);
     }
     
     /**
      * @param plot
      */
     public static void getComments(Plot plot, String inbox, RunnableVal<List<PlotComment>> whenDone) {
-        if ((plot != null) && (plot.temp == -1)) {
+        if (plot != null && plot.temp == -1) {
             return;
         }
-        dbManager.getComments(plot, inbox, whenDone);
+        DBFunc.dbManager.getComments(plot, inbox, whenDone);
     }
     
     /**
@@ -332,7 +332,7 @@ public class DBFunc {
         if (plot.temp == -1) {
             return;
         }
-        dbManager.removeTrusted(plot, uuid);
+        DBFunc.dbManager.removeTrusted(plot, uuid);
     }
     
     /**
@@ -340,14 +340,14 @@ public class DBFunc {
      * @param uuid
      */
     public static void removeHelper(PlotCluster cluster, UUID uuid) {
-        dbManager.removeHelper(cluster, uuid);
+        DBFunc.dbManager.removeHelper(cluster, uuid);
     }
     
     /**
      * @param cluster
      */
     public static void createCluster(PlotCluster cluster) {
-        dbManager.createCluster(cluster);
+        DBFunc.dbManager.createCluster(cluster);
     }
     
     /**
@@ -356,7 +356,7 @@ public class DBFunc {
      * @param max
      */
     public static void resizeCluster(PlotCluster current, PlotId min, PlotId max) {
-        dbManager.resizeCluster(current, min, max);
+        DBFunc.dbManager.resizeCluster(current, min, max);
     }
     
     /**
@@ -367,7 +367,7 @@ public class DBFunc {
         if (plot.temp == -1) {
             return;
         }
-        dbManager.removeMember(plot, uuid);
+        DBFunc.dbManager.removeMember(plot, uuid);
     }
     
     /**
@@ -376,7 +376,7 @@ public class DBFunc {
      * @param uuid
      */
     public static void removeInvited(PlotCluster cluster, UUID uuid) {
-        dbManager.removeInvited(cluster, uuid);
+        DBFunc.dbManager.removeInvited(cluster, uuid);
     }
     
     /**
@@ -387,11 +387,11 @@ public class DBFunc {
         if (plot.temp == -1) {
             return;
         }
-        dbManager.setTrusted(plot, uuid);
+        DBFunc.dbManager.setTrusted(plot, uuid);
     }
 
     public static void setHelper(PlotCluster cluster, UUID uuid) {
-        dbManager.setHelper(cluster, uuid);
+        DBFunc.dbManager.setHelper(cluster, uuid);
     }
     
     /**
@@ -402,11 +402,11 @@ public class DBFunc {
         if (plot.temp == -1) {
             return;
         }
-        dbManager.setMember(plot, uuid);
+        DBFunc.dbManager.setMember(plot, uuid);
     }
 
     public static void setInvited(PlotCluster cluster, UUID uuid) {
-        dbManager.setInvited(cluster, uuid);
+        DBFunc.dbManager.setInvited(cluster, uuid);
     }
     
     /**
@@ -417,7 +417,7 @@ public class DBFunc {
         if (plot.temp == -1) {
             return;
         }
-        dbManager.removeDenied(plot, uuid);
+        DBFunc.dbManager.removeDenied(plot, uuid);
     }
     
     /**
@@ -428,33 +428,33 @@ public class DBFunc {
         if (plot.temp == -1) {
             return;
         }
-        dbManager.setDenied(plot, uuid);
+        DBFunc.dbManager.setDenied(plot, uuid);
     }
 
     public static HashMap<UUID, Integer> getRatings(Plot plot) {
         if (plot.temp == -1) {
             return new HashMap<>(0);
         }
-        return dbManager.getRatings(plot);
+        return DBFunc.dbManager.getRatings(plot);
     }
 
     public static void setRating(Plot plot, UUID rater, int value) {
         if (plot.temp == -1) {
             return;
         }
-        dbManager.setRating(plot, rater, value);
+        DBFunc.dbManager.setRating(plot, rater, value);
     }
     
     public static HashMap<String, Set<PlotCluster>> getClusters() {
-        return dbManager.getClusters();
+        return DBFunc.dbManager.getClusters();
     }
 
     public static void setPosition(PlotCluster cluster, String position) {
-        dbManager.setPosition(cluster, position);
+        DBFunc.dbManager.setPosition(cluster, position);
     }
     
     public static void replaceWorld(String oldWorld, String newWorld, PlotId min, PlotId max) {
-        dbManager.replaceWorld(oldWorld, newWorld, min, max);
+        DBFunc.dbManager.replaceWorld(oldWorld, newWorld, min, max);
     }
     
     /**
@@ -463,10 +463,10 @@ public class DBFunc {
      * @param now
      */
     public static void replaceUUID(UUID old, UUID now) {
-        dbManager.replaceUUID(old, now);
+        DBFunc.dbManager.replaceUUID(old, now);
     }
     
     public static void close() {
-        dbManager.close();
+        DBFunc.dbManager.close();
     }
 }
diff --git a/Core/src/main/java/com/intellectualcrafters/plot/database/SQLManager.java b/Core/src/main/java/com/intellectualcrafters/plot/database/SQLManager.java
index fee61071f..4ff60e809 100644
--- a/Core/src/main/java/com/intellectualcrafters/plot/database/SQLManager.java
+++ b/Core/src/main/java/com/intellectualcrafters/plot/database/SQLManager.java
@@ -40,9 +40,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.atomic.AtomicInteger;
 
-/**
 
- */
 public class SQLManager implements AbstractDB {
     // Public final
     public final String SET_OWNER;
@@ -187,11 +185,11 @@ public class SQLManager implements AbstractDB {
                 }
 
                 @Override
-                public void addBatch(PreparedStatement stmt) {
+                public void addBatch(PreparedStatement statement) {
                 }
 
                 @Override
-                public void execute(PreparedStatement stmt) {
+                public void execute(PreparedStatement statement) {
                 }
 
             };
@@ -221,11 +219,11 @@ public class SQLManager implements AbstractDB {
                 }
 
                 @Override
-                public void addBatch(PreparedStatement stmt) {
+                public void addBatch(PreparedStatement statement) {
                 }
 
                 @Override
-                public void execute(PreparedStatement stmt) {
+                public void execute(PreparedStatement statement) {
                 }
 
             };
@@ -252,11 +250,11 @@ public class SQLManager implements AbstractDB {
                 }
 
                 @Override
-                public void addBatch(PreparedStatement stmt) {
+                public void addBatch(PreparedStatement statement) {
                 }
 
                 @Override
-                public void execute(PreparedStatement stmt) {
+                public void execute(PreparedStatement statement) {
                 }
 
             };
@@ -294,7 +292,7 @@ public class SQLManager implements AbstractDB {
                     this.connection.setAutoCommit(false);
                 }
                 String method = null;
-                PreparedStatement stmt = null;
+                PreparedStatement statement = null;
                 UniqueStatement task = null;
                 UniqueStatement lastTask = null;
                 for (Entry<Plot, Queue<UniqueStatement>> entry : this.plotTasks.entrySet()) {
@@ -306,22 +304,22 @@ public class SQLManager implements AbstractDB {
                     task = this.plotTasks.get(plot).remove();
                     count++;
                     if (task != null) {
-                        if (task._method == null || !task._method.equals(method)) {
-                            if (stmt != null) {
-                                lastTask.execute(stmt);
-                                stmt.close();
+                        if (task.method == null || !task.method.equals(method)) {
+                            if (statement != null) {
+                                lastTask.execute(statement);
+                                statement.close();
                             }
-                            method = task._method;
-                            stmt = task.get();
+                            method = task.method;
+                            statement = task.get();
                         }
-                        task.set(stmt);
-                        task.addBatch(stmt);
+                        task.set(statement);
+                        task.addBatch(statement);
                     }
                     lastTask = task;
                 }
-                if (stmt != null && task != null) {
-                    task.execute(stmt);
-                    stmt.close();
+                if (statement != null && task != null) {
+                    task.execute(statement);
+                    statement.close();
                 }
             }
             if (!this.playerTasks.isEmpty()) {
@@ -330,7 +328,7 @@ public class SQLManager implements AbstractDB {
                     this.connection.setAutoCommit(false);
                 }
                 String method = null;
-                PreparedStatement stmt = null;
+                PreparedStatement statement = null;
                 UniqueStatement task = null;
                 UniqueStatement lastTask = null;
                 for (Entry<UUID, Queue<UniqueStatement>> entry : this.playerTasks.entrySet()) {
@@ -342,22 +340,22 @@ public class SQLManager implements AbstractDB {
                     task = this.playerTasks.get(uuid).remove();
                     count++;
                     if (task != null) {
-                        if (task._method == null || !task._method.equals(method)) {
-                            if (stmt != null) {
-                                lastTask.execute(stmt);
-                                stmt.close();
+                        if (task.method == null || !task.method.equals(method)) {
+                            if (statement != null) {
+                                lastTask.execute(statement);
+                                statement.close();
                             }
-                            method = task._method;
-                            stmt = task.get();
+                            method = task.method;
+                            statement = task.get();
                         }
-                        task.set(stmt);
-                        task.addBatch(stmt);
+                        task.set(statement);
+                        task.addBatch(statement);
                     }
                     lastTask = task;
                 }
-                if (stmt != null && task != null) {
-                    task.execute(stmt);
-                    stmt.close();
+                if (statement != null && task != null) {
+                    task.execute(statement);
+                    statement.close();
                 }
             }
             if (!this.clusterTasks.isEmpty()) {
@@ -366,7 +364,7 @@ public class SQLManager implements AbstractDB {
                     this.connection.setAutoCommit(false);
                 }
                 String method = null;
-                PreparedStatement stmt = null;
+                PreparedStatement statement = null;
                 UniqueStatement task = null;
                 UniqueStatement lastTask = null;
                 for (Entry<PlotCluster, Queue<UniqueStatement>> entry : this.clusterTasks.entrySet()) {
@@ -378,22 +376,22 @@ public class SQLManager implements AbstractDB {
                     task = this.clusterTasks.get(cluster).remove();
                     count++;
                     if (task != null) {
-                        if (task._method == null || !task._method.equals(method)) {
-                            if (stmt != null) {
-                                lastTask.execute(stmt);
-                                stmt.close();
+                        if (task.method == null || !task.method.equals(method)) {
+                            if (statement != null) {
+                                lastTask.execute(statement);
+                                statement.close();
                             }
-                            method = task._method;
-                            stmt = task.get();
+                            method = task.method;
+                            statement = task.get();
                         }
-                        task.set(stmt);
-                        task.addBatch(stmt);
+                        task.set(statement);
+                        task.addBatch(statement);
                     }
                     lastTask = task;
                 }
-                if (stmt != null && task != null) {
-                    task.execute(stmt);
-                    stmt.close();
+                if (statement != null && task != null) {
+                    task.execute(statement);
+                    statement.close();
                 }
             }
             if (count > 0) {
@@ -614,7 +612,7 @@ public class SQLManager implements AbstractDB {
                 try {
                     stmt.setString(i * 5 + 3, plot.owner.toString());
                 } catch (SQLException e) {
-                    stmt.setString(i * 5 + 3, everyone.toString());
+                    stmt.setString(i * 5 + 3, AbstractDB.everyone.toString());
                 }
                 stmt.setString(i * 5 + 4, plot.getArea().toString());
                 stmt.setTimestamp(i * 5 + 5, new Timestamp(plot.getTimestamp()));
@@ -628,7 +626,7 @@ public class SQLManager implements AbstractDB {
                 try {
                     stmt.setString(i * 6 + 4, plot.owner.toString());
                 } catch (SQLException e1) {
-                    stmt.setString(i * 6 + 4, everyone.toString());
+                    stmt.setString(i * 6 + 4, AbstractDB.everyone.toString());
                 }
                 stmt.setString(i * 6 + 5, plot.getArea().toString());
                 stmt.setTimestamp(i * 6 + 6, new Timestamp(plot.getTimestamp()));
@@ -989,14 +987,14 @@ public class SQLManager implements AbstractDB {
             }
 
             @Override
-            public void execute(PreparedStatement stmt) {
+            public void execute(PreparedStatement statement) {
 
             }
 
             @Override
-            public void addBatch(PreparedStatement stmt) throws SQLException {
-                stmt.executeUpdate();
-                ResultSet keys = stmt.getGeneratedKeys();
+            public void addBatch(PreparedStatement statement) throws SQLException {
+                statement.executeUpdate();
+                ResultSet keys = statement.getGeneratedKeys();
                 if (keys.next()) {
                     plot.temp = keys.getInt(1);
                 }
@@ -1476,8 +1474,9 @@ public class SQLManager implements AbstractDB {
             if (this.mySQL && !PS.get().checkVersion(oldVersion, 3, 3, 2)) {
                 try (Statement stmt = this.connection.createStatement()) {
                     stmt.executeUpdate("ALTER TABLE `" + this.prefix + "plots` DROP INDEX `unique_alias`");
+                } catch (SQLException ignore) {
+                    //ignored
                 }
-                catch (SQLException ignore) {}
             }
             DatabaseMetaData data = this.connection.getMetaData();
             ResultSet rs = data.getColumns(null, null, this.prefix + "plot_comments", "plot_plot_id");
@@ -2178,7 +2177,7 @@ public class SQLManager implements AbstractDB {
             }
 
             @Override
-            public void execute(PreparedStatement stmt) {
+            public void execute(PreparedStatement statement) {
             }
 
             @Override
@@ -2480,11 +2479,12 @@ public class SQLManager implements AbstractDB {
             }
 
             @Override
-            public void execute(PreparedStatement stmt) {}
+            public void execute(PreparedStatement statement) {
+            }
 
             @Override
-            public void addBatch(PreparedStatement stmt) throws SQLException {
-                ResultSet resultSet = stmt.executeQuery();
+            public void addBatch(PreparedStatement statement) throws SQLException {
+                ResultSet resultSet = statement.executeQuery();
 
                 Map<String, byte[]> metaMap = new HashMap<>();
 
@@ -2782,14 +2782,14 @@ public class SQLManager implements AbstractDB {
             }
 
             @Override
-            public void execute(PreparedStatement stmt) {
+            public void execute(PreparedStatement statement) {
 
             }
 
             @Override
-            public void addBatch(PreparedStatement stmt) throws SQLException {
-                stmt.executeUpdate();
-                ResultSet keys = stmt.getGeneratedKeys();
+            public void addBatch(PreparedStatement statement) throws SQLException {
+                statement.executeUpdate();
+                ResultSet keys = statement.getGeneratedKeys();
                 if (keys.next()) {
                     cluster.temp = keys.getInt(1);
                 }
@@ -3146,18 +3146,18 @@ public class SQLManager implements AbstractDB {
 
     public abstract class UniqueStatement {
 
-        public String _method;
+        public String method;
 
         public UniqueStatement(String method) {
-            this._method = method;
+            this.method = method;
         }
 
-        public void addBatch(PreparedStatement stmt) throws SQLException {
-            stmt.addBatch();
+        public void addBatch(PreparedStatement statement) throws SQLException {
+            statement.addBatch();
         }
 
-        public void execute(PreparedStatement stmt) throws SQLException {
-            stmt.executeBatch();
+        public void execute(PreparedStatement statement) throws SQLException {
+            statement.executeBatch();
         }
 
         public abstract PreparedStatement get() throws SQLException;
diff --git a/Core/src/main/java/com/intellectualcrafters/plot/database/StmtMod.java b/Core/src/main/java/com/intellectualcrafters/plot/database/StmtMod.java
index 661a2099e..d88ed211a 100644
--- a/Core/src/main/java/com/intellectualcrafters/plot/database/StmtMod.java
+++ b/Core/src/main/java/com/intellectualcrafters/plot/database/StmtMod.java
@@ -11,7 +11,7 @@ public abstract class StmtMod<T> {
 
     public String getCreateMySQL(int size, String query, int params) {
         StringBuilder statement = new StringBuilder(query);
-        for (int i = 0; i < (size - 1); i++) {
+        for (int i = 0; i < size - 1; i++) {
             statement.append("(" + StringMan.repeat(",?", params).substring(1) + "),");
         }
         statement.append("(" + StringMan.repeat(",?", params).substring(1) + ")");
@@ -21,7 +21,7 @@ public abstract class StmtMod<T> {
     public String getCreateSQLite(int size, String query, int params) {
         StringBuilder statement = new StringBuilder(query);
         String modParams = StringMan.repeat(",?", params).substring(1);
-        for (int i = 0; i < (size - 1); i++) {
+        for (int i = 0; i < size - 1; i++) {
             statement.append("UNION SELECT " + modParams + " ");
         }
         return statement.toString();
diff --git a/Core/src/main/java/com/intellectualcrafters/plot/flag/AbstractFlag.java b/Core/src/main/java/com/intellectualcrafters/plot/flag/AbstractFlag.java
index 6a6fe2aaa..d220f5fe9 100644
--- a/Core/src/main/java/com/intellectualcrafters/plot/flag/AbstractFlag.java
+++ b/Core/src/main/java/com/intellectualcrafters/plot/flag/AbstractFlag.java
@@ -11,8 +11,8 @@ import com.intellectualcrafters.plot.util.StringMan;
 public class AbstractFlag {
     public final String key;
     public final FlagValue<?> value;
-    
-    public AbstractFlag(final String key) {
+
+    public AbstractFlag(String key) {
         this(key, new FlagValue.StringValue());
     }
     
@@ -21,7 +21,7 @@ public class AbstractFlag {
      * The key must be alphabetical characters and &lt;= 16 characters in length
      * @param key
      */
-    public AbstractFlag(final String key, final FlagValue<?> value) {
+    public AbstractFlag(String key, FlagValue<?> value) {
         if (!StringMan.isAlpha(key.replaceAll("_", "").replaceAll("-", ""))) {
             throw new IllegalArgumentException("Flag must be alphabetic characters");
         }
@@ -37,23 +37,23 @@ public class AbstractFlag {
     }
     
     public boolean isList() {
-        return value instanceof FlagValue.ListValue;
+        return this.value instanceof FlagValue.ListValue;
     }
-    
-    public Object parseValueRaw(final String value) {
+
+    public Object parseValueRaw(String value) {
         try {
             return this.value.parse(value);
-        } catch (final Exception e) {
+        } catch (Exception e) {
             return null;
         }
     }
-    
-    public String toString(final Object t) {
-        return value.toString(t);
+
+    public String toString(Object t) {
+        return this.value.toString(t);
     }
     
     public String getValueDesc() {
-        return value.getDescription();
+        return this.value.getDescription();
     }
     
     /**
@@ -62,28 +62,28 @@ public class AbstractFlag {
      * @return String
      */
     public String getKey() {
-        return key;
+        return this.key;
     }
     
     @Override
     public String toString() {
-        return key;
+        return this.key;
     }
     
     @Override
     public int hashCode() {
-        return key.hashCode();
+        return this.key.hashCode();
     }
     
     @Override
-    public boolean equals(final Object other) {
+    public boolean equals(Object other) {
         if (other == this) {
             return true;
         }
         if (!(other instanceof AbstractFlag)) {
             return false;
         }
-        final AbstractFlag otherObj = (AbstractFlag) other;
-        return otherObj.key.equals(key);
+        AbstractFlag otherObj = (AbstractFlag) other;
+        return otherObj.key.equals(this.key);
     }
 }
diff --git a/Core/src/main/java/com/intellectualcrafters/plot/flag/FlagValue.java b/Core/src/main/java/com/intellectualcrafters/plot/flag/FlagValue.java
index 33b14627b..6f9f29ec2 100644
--- a/Core/src/main/java/com/intellectualcrafters/plot/flag/FlagValue.java
+++ b/Core/src/main/java/com/intellectualcrafters/plot/flag/FlagValue.java
@@ -4,6 +4,7 @@ import com.intellectualcrafters.plot.object.PlotBlock;
 import com.intellectualcrafters.plot.util.StringComparison;
 import com.intellectualcrafters.plot.util.StringMan;
 import com.intellectualcrafters.plot.util.WorldUtil;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
@@ -26,7 +27,7 @@ public abstract class FlagValue<T> {
     }
 
     public boolean validValue(Object value) {
-        return (value != null) && (value.getClass() == this.clazz);
+        return value != null && value.getClass() == this.clazz;
     }
 
     public String toString(Object t) {
@@ -59,18 +60,15 @@ public abstract class FlagValue<T> {
                 case "1":
                 case "yes":
                 case "allow":
-                case "true": {
+                case "true":
                     return true;
-                }
                 case "0":
                 case "no":
                 case "deny":
-                case "false": {
+                case "false":
                     return false;
-                }
-                default: {
+                default:
                     return null;
-                }
             }
         }
 
@@ -291,7 +289,7 @@ public abstract class FlagValue<T> {
                 return new PlotBlock(id, data);
             } catch (Exception e) {
                 StringComparison<PlotBlock>.ComparisonResult value = WorldUtil.IMP.getClosestBlock(t);
-                if ((value == null) || (value.match > 1)) {
+                if (value == null || value.match > 1) {
                     return null;
                 }
                 return value.best;
@@ -339,7 +337,7 @@ public abstract class FlagValue<T> {
                     block = new PlotBlock(id, data);
                 } catch (Exception e) {
                     StringComparison<PlotBlock>.ComparisonResult value = WorldUtil.IMP.getClosestBlock(t);
-                    if ((value == null) || (value.match > 1)) {
+                    if (value == null || value.match > 1) {
                         continue;
                     }
                     block = value.best;
diff --git a/Core/src/main/java/com/intellectualcrafters/plot/generator/ClassicPlotManager.java b/Core/src/main/java/com/intellectualcrafters/plot/generator/ClassicPlotManager.java
index a8367573d..4d06944d7 100644
--- a/Core/src/main/java/com/intellectualcrafters/plot/generator/ClassicPlotManager.java
+++ b/Core/src/main/java/com/intellectualcrafters/plot/generator/ClassicPlotManager.java
@@ -20,38 +20,30 @@ public class ClassicPlotManager extends SquarePlotManager {
     @Override
     public boolean setComponent(PlotArea plotworld, PlotId plotid, String component, PlotBlock[] blocks) {
         switch (component) {
-            case "floor": {
+            case "floor":
                 setFloor(plotworld, plotid, blocks);
                 return true;
-            }
-            case "wall": {
+            case "wall":
                 setWallFilling(plotworld, plotid, blocks);
                 return true;
-            }
-            case "all": {
+            case "all":
                 setAll(plotworld, plotid, blocks);
                 return true;
-            }
-            case "air": {
+            case "air":
                 setAir(plotworld, plotid, blocks);
                 return true;
-            }
-            case "main": {
+            case "main":
                 setMain(plotworld, plotid, blocks);
                 return true;
-            }
-            case "middle": {
+            case "middle":
                 setMiddle(plotworld, plotid, blocks);
                 return true;
-            }
-            case "outline": {
+            case "outline":
                 setOutline(plotworld, plotid, blocks);
                 return true;
-            }
-            case "border": {
+            case "border":
                 setWall(plotworld, plotid, blocks);
                 return true;
-            }
         }
         return false;
     }
@@ -459,6 +451,6 @@ public class ClassicPlotManager extends SquarePlotManager {
         ClassicPlotWorld dpw = (ClassicPlotWorld) plotworld;
         plot = plot.getBasePlot(false);
         Location bot = plot.getBottomAbs();
-        return new com.intellectualcrafters.plot.object.Location(plotworld.worldname, bot.getX() - 1, dpw.ROAD_HEIGHT + 1, bot.getZ() - 2);
+        return new Location(plotworld.worldname, bot.getX() - 1, dpw.ROAD_HEIGHT + 1, bot.getZ() - 2);
     }
 }
diff --git a/Core/src/main/java/com/intellectualcrafters/plot/object/Rating.java b/Core/src/main/java/com/intellectualcrafters/plot/object/Rating.java
index 18b09759e..3f3b2e58d 100644
--- a/Core/src/main/java/com/intellectualcrafters/plot/object/Rating.java
+++ b/Core/src/main/java/com/intellectualcrafters/plot/object/Rating.java
@@ -18,7 +18,7 @@ public class Rating {
     public Rating(int value) {
         this.initial = value;
         this.ratingMap = new HashMap<>();
-        if ((Settings.RATING_CATEGORIES != null) && (Settings.RATING_CATEGORIES.size() > 1)) {
+        if (Settings.RATING_CATEGORIES != null && Settings.RATING_CATEGORIES.size() > 1) {
             if (value < 10) {
                 for (String ratingCategory : Settings.RATING_CATEGORIES) {
                     this.ratingMap.put(ratingCategory, value);
@@ -27,7 +27,7 @@ public class Rating {
                 return;
             }
             for (String ratingCategory : Settings.RATING_CATEGORIES) {
-                this.ratingMap.put(ratingCategory, (value % 10) - 1);
+                this.ratingMap.put(ratingCategory, value % 10 - 1);
                 value = value / 10;
             }
         } else {
@@ -66,7 +66,7 @@ public class Rating {
         if (!this.changed) {
             return this.initial;
         }
-        if ((Settings.RATING_CATEGORIES != null) && (Settings.RATING_CATEGORIES.size() > 1)) {
+        if (Settings.RATING_CATEGORIES != null && Settings.RATING_CATEGORIES.size() > 1) {
             int val = 0;
             for (int i = 0; i < Settings.RATING_CATEGORIES.size(); i++) {
                 val += (i + 1) * Math.pow(10, this.ratingMap.get(Settings.RATING_CATEGORIES.get(i)));
diff --git a/Core/src/main/java/com/intellectualcrafters/plot/object/RegionWrapper.java b/Core/src/main/java/com/intellectualcrafters/plot/object/RegionWrapper.java
index 5ec25e0bd..1ce85bfa8 100644
--- a/Core/src/main/java/com/intellectualcrafters/plot/object/RegionWrapper.java
+++ b/Core/src/main/java/com/intellectualcrafters/plot/object/RegionWrapper.java
@@ -7,17 +7,17 @@ public class RegionWrapper {
     public final int maxY;
     public final int minZ;
     public final int maxZ;
-    
-    public RegionWrapper(final int minX, final int maxX, final int minZ, final int maxZ) {
+
+    public RegionWrapper(int minX, int maxX, int minZ, int maxZ) {
         this.maxX = maxX;
         this.minX = minX;
         this.maxZ = maxZ;
         this.minZ = minZ;
-        minY = 0;
-        maxY = 256;
+        this.minY = 0;
+        this.maxY = 256;
     }
-    
-    public RegionWrapper(final int minX, final int maxX, final int minY, final int maxY, final int minZ, final int maxZ) {
+
+    public RegionWrapper(int minX, int maxX, int minY, int maxY, int minZ, int maxZ) {
         this.maxX = maxX;
         this.minX = minX;
         this.maxZ = maxZ;
@@ -25,13 +25,13 @@ public class RegionWrapper {
         this.minY = minY;
         this.maxY = maxY;
     }
-    
-    public boolean isIn(final int x, final int y, final int z) {
-        return x >= minX && x <= maxX && z >= minZ && z <= maxZ && y >= minY && y <= maxY;
+
+    public boolean isIn(int x, int y, int z) {
+        return x >= this.minX && x <= this.maxX && z >= this.minZ && z <= this.maxZ && y >= this.minY && y <= this.maxY;
     }
-    
-    public boolean isIn(final int x, final int z) {
-        return x >= minX && x <= maxX && z >= minZ && z <= maxZ;
+
+    public boolean isIn(int x, int z) {
+        return x >= this.minX && x <= this.maxX && z >= this.minZ && z <= this.maxZ;
     }
     
     public boolean intersects(RegionWrapper other) {
@@ -40,7 +40,7 @@ public class RegionWrapper {
 
     @Override
     public int hashCode() {
-        return minX + 13 * maxX + 23 * minZ + 39 * maxZ;
+        return this.minX + 13 * this.maxX + 23 * this.minZ + 39 * this.maxZ;
     }
     
     @Override
@@ -53,19 +53,20 @@ public class RegionWrapper {
         }
         if (obj instanceof RegionWrapper) {
             RegionWrapper other = (RegionWrapper) obj;
-            return minX == other.minX && minZ == other.minZ && minY == other.minY && maxX == other.maxX && maxZ == other.maxZ && maxY == other.maxY;
+            return this.minX == other.minX && this.minZ == other.minZ && this.minY == other.minY && this.maxX == other.maxX && this.maxZ == other.maxZ
+                    && this.maxY == other.maxY;
         }
         return false;
     }
     
     @Override
     public String toString() {
-        return minX + "->" + maxX + "," + minZ + "->" + maxZ;
+        return this.minX + "->" + this.maxX + "," + this.minZ + "->" + this.maxZ;
     }
     
     public Location[] getCorners(String world) {
-        Location pos1 = new Location(world, minX, minY, minZ);
-        Location pos2 = new Location(world, maxX, maxY, maxZ);
+        Location pos1 = new Location(world, this.minX, this.minY, this.minZ);
+        Location pos2 = new Location(world, this.maxX, this.maxY, this.maxZ);
         return new Location[] { pos1, pos2 };
     }
 }
diff --git a/Core/src/main/java/com/intellectualcrafters/plot/object/RunnableVal.java b/Core/src/main/java/com/intellectualcrafters/plot/object/RunnableVal.java
index f92c43120..e2c99da36 100644
--- a/Core/src/main/java/com/intellectualcrafters/plot/object/RunnableVal.java
+++ b/Core/src/main/java/com/intellectualcrafters/plot/object/RunnableVal.java
@@ -11,7 +11,7 @@ public abstract class RunnableVal<T> implements Runnable {
 
     @Override
     public void run() {
-        run(value);
+        run(this.value);
     }
     
     public abstract void run(T value);
diff --git a/Core/src/main/java/com/intellectualcrafters/plot/object/RunnableVal2.java b/Core/src/main/java/com/intellectualcrafters/plot/object/RunnableVal2.java
index 3906eec0b..acdc94bcd 100644
--- a/Core/src/main/java/com/intellectualcrafters/plot/object/RunnableVal2.java
+++ b/Core/src/main/java/com/intellectualcrafters/plot/object/RunnableVal2.java
@@ -13,7 +13,7 @@ public abstract class RunnableVal2<T, U> implements Runnable {
 
     @Override
     public void run() {
-        run(value1, value2);
+        run(this.value1, this.value2);
     }
     
     public abstract void run(T value1, U value2);
diff --git a/Core/src/main/java/com/intellectualcrafters/plot/util/MainUtil.java b/Core/src/main/java/com/intellectualcrafters/plot/util/MainUtil.java
index 1a1e114ac..dd612eaf9 100644
--- a/Core/src/main/java/com/intellectualcrafters/plot/util/MainUtil.java
+++ b/Core/src/main/java/com/intellectualcrafters/plot/util/MainUtil.java
@@ -222,35 +222,31 @@ public class MainUtil {
                 case "week":
                 case "weeks":
                 case "wks":
-                case "w": {
+                case "w":
+
                     time += 604800 * nums;
-                }
                 case "days":
                 case "day":
-                case "d": {
+                case "d":
                     time += 86400 * nums;
-                }
                 case "hour":
                 case "hr":
                 case "hrs":
                 case "hours":
-                case "h": {
+                case "h":
                     time += 3600 * nums;
-                }
                 case "minutes":
                 case "minute":
                 case "mins":
                 case "min":
-                case "m": {
+                case "m":
                     time += 60 * nums;
-                }
                 case "seconds":
                 case "second":
                 case "secs":
                 case "sec":
-                case "s": {
+                case "s":
                     time += nums;
-                }
             }
         }
         return time;
diff --git a/Core/src/main/java/com/plotsquared/general/commands/Command.java b/Core/src/main/java/com/plotsquared/general/commands/Command.java
index 36775fd83..3b90f0eef 100644
--- a/Core/src/main/java/com/plotsquared/general/commands/Command.java
+++ b/Core/src/main/java/com/plotsquared/general/commands/Command.java
@@ -302,29 +302,27 @@ public abstract class Command {
             }
             // Command recommendation
             MainUtil.sendMessage(player, C.NOT_VALID_SUBCOMMAND);
-            {
-                List<Command> commands = getCommands(player);
-                if (commands.isEmpty()) {
-                    MainUtil.sendMessage(player, C.DID_YOU_MEAN, MainCommand.getInstance().help.getUsage());
-                    return;
-                }
-                HashSet<String> setargs = new HashSet<>(args.length);
-                for (String arg : args) {
-                    setargs.add(arg.toLowerCase());
-                }
-                String[] allargs = setargs.toArray(new String[setargs.size()]);
-                int best = 0;
-                for (Command current : commands) {
-                    int match = getMatch(allargs, current);
-                    if (match > best) {
-                        cmd = current;
-                    }
-                }
-                if (cmd == null) {
-                    cmd = new StringComparison<>(args[0], this.allCommands).getMatchObject();
-                }
-                MainUtil.sendMessage(player, C.DID_YOU_MEAN, cmd.getUsage());
+            List<Command> commands = getCommands(player);
+            if (commands.isEmpty()) {
+                MainUtil.sendMessage(player, C.DID_YOU_MEAN, MainCommand.getInstance().help.getUsage());
+                return;
             }
+            HashSet<String> setargs = new HashSet<>(args.length);
+            for (String arg : args) {
+                setargs.add(arg.toLowerCase());
+            }
+            String[] allargs = setargs.toArray(new String[setargs.size()]);
+            int best = 0;
+            for (Command current : commands) {
+                int match = getMatch(allargs, current);
+                if (match > best) {
+                    cmd = current;
+                }
+            }
+            if (cmd == null) {
+                cmd = new StringComparison<>(args[0], this.allCommands).getMatchObject();
+            }
+            MainUtil.sendMessage(player, C.DID_YOU_MEAN, cmd.getUsage());
             return;
         }
         String[] newArgs = Arrays.copyOfRange(args, 1, args.length);
@@ -336,7 +334,7 @@ public abstract class Command {
 
     public boolean checkArgs(PlotPlayer player, String[] args) {
         Argument<?>[] reqArgs = getRequiredArguments();
-        if ((reqArgs != null) && (reqArgs.length > 0)) {
+        if (reqArgs != null && reqArgs.length > 0) {
             boolean failed = args.length < reqArgs.length;
             String[] baseSplit = getCommandString().split(" ");
             String[] fullSplit = getUsage().split(" ");
diff --git a/Core/src/main/java/com/plotsquared/listener/ProcessedWEExtent.java b/Core/src/main/java/com/plotsquared/listener/ProcessedWEExtent.java
index f524e4249..1f11b023f 100644
--- a/Core/src/main/java/com/plotsquared/listener/ProcessedWEExtent.java
+++ b/Core/src/main/java/com/plotsquared/listener/ProcessedWEExtent.java
@@ -13,6 +13,7 @@ import com.sk89q.worldedit.entity.BaseEntity;
 import com.sk89q.worldedit.entity.Entity;
 import com.sk89q.worldedit.extent.AbstractDelegateExtent;
 import com.sk89q.worldedit.extent.Extent;
+import com.sk89q.worldedit.extent.NullExtent;
 import com.sk89q.worldedit.util.Location;
 import com.sk89q.worldedit.world.biome.BaseBiome;
 
@@ -81,7 +82,7 @@ public class ProcessedWEExtent extends AbstractDelegateExtent {
             case 29:
             case 33:
             case 151:
-            case 178: {
+            case 178:
                 if (this.BSblocked) {
                     return false;
                 }
@@ -96,7 +97,7 @@ public class ProcessedWEExtent extends AbstractDelegateExtent {
                             try {
                                 Field field = AbstractDelegateExtent.class.getDeclaredField("extent");
                                 field.setAccessible(true);
-                                field.set(this.parent, new com.sk89q.worldedit.extent.NullExtent());
+                                field.set(this.parent, new NullExtent());
                             } catch (Exception e) {
                                 e.printStackTrace();
                             }
@@ -107,8 +108,7 @@ public class ProcessedWEExtent extends AbstractDelegateExtent {
                     return super.setBlock(location, block);
                 }
                 break;
-            }
-            default: {
+            default:
                 int x = location.getBlockX();
                 int y = location.getBlockY();
                 int z = location.getBlockZ();
@@ -118,7 +118,7 @@ public class ProcessedWEExtent extends AbstractDelegateExtent {
                             try {
                                 Field field = AbstractDelegateExtent.class.getDeclaredField("extent");
                                 field.setAccessible(true);
-                                field.set(this.parent, new com.sk89q.worldedit.extent.NullExtent());
+                                field.set(this.parent, new NullExtent());
                             } catch (Exception e) {
                                 e.printStackTrace();
                             }
@@ -208,26 +208,23 @@ public class ProcessedWEExtent extends AbstractDelegateExtent {
                         case 189:
                         case 190:
                         case 191:
-                        case 192: {
+                        case 192:
                             if (Settings.EXPERIMENTAL_FAST_ASYNC_WORLDEDIT) {
                                 SetQueue.IMP.setBlock(this.world, x, y, z, id);
                             } else {
                                 super.setBlock(location, block);
                             }
                             break;
-                        }
-                        default: {
+                        default:
                             if (Settings.EXPERIMENTAL_FAST_ASYNC_WORLDEDIT) {
                                 SetQueue.IMP.setBlock(this.world, x, y, z, new PlotBlock((short) id, (byte) block.getData()));
                             } else {
                                 super.setBlock(location, block);
                             }
                             break;
-                        }
                     }
                     return true;
                 }
-            }
 
         }
         return false;
diff --git a/Sponge/src/main/java/com/plotsquared/sponge/listener/MainListener.java b/Sponge/src/main/java/com/plotsquared/sponge/listener/MainListener.java
index de1001754..c08219e4d 100644
--- a/Sponge/src/main/java/com/plotsquared/sponge/listener/MainListener.java
+++ b/Sponge/src/main/java/com/plotsquared/sponge/listener/MainListener.java
@@ -91,7 +91,7 @@ public class MainListener {
     @Listener
     public void onCommand(SendCommandEvent event) {
         switch (event.getCommand().toLowerCase()) {
-            case "plotme": {
+            case "plotme":
                 Player source = SpongeUtil.getCause(event.getCause(), Player.class);
                 if (source == null) {
                     return;
@@ -102,7 +102,6 @@ public class MainListener {
                     source.sendMessage(SpongeUtil.getText(C.NOT_USING_PLOTME.s()));
                 }
                 event.setCancelled(true);
-            }
         }
     }
     
@@ -119,7 +118,7 @@ public class MainListener {
         }
         PlotArea plotworld = PS.get().getPlotAreaByString(world);
         PlotPlayer plr = SpongeUtil.getPlayer(player);
-        if (!plotworld.PLOT_CHAT && ((plr.getMeta("chat") == null) || !(Boolean) plr.getMeta("chat"))) {
+        if (!plotworld.PLOT_CHAT && (plr.getMeta("chat") == null || !(Boolean) plr.getMeta("chat"))) {
             return;
         }
         Location loc = SpongeUtil.getLocation(player);
@@ -222,7 +221,7 @@ public class MainListener {
                         return false;
                     }
                 }
-                if ((entity instanceof Ambient) || (entity instanceof Animal)) {
+                if (entity instanceof Ambient || entity instanceof Animal) {
                     Flag animalFlag = FlagManager.getPlotFlagRaw(plot, "animal-cap");
                     if (animalFlag != null) {
                         int cap = (Integer) animalFlag.getValue();
@@ -252,7 +251,7 @@ public class MainListener {
                     }
                 }
                 return true;
-            } else if ((entity instanceof Minecart) || (entity instanceof Boat)) {
+            } else if (entity instanceof Minecart || entity instanceof Boat) {
                 Flag vehicleFlag = FlagManager.getPlotFlagRaw(plot, "vehicle-cap");
                 if (vehicleFlag != null) {
                     int cap = (Integer) vehicleFlag.getValue();
@@ -358,7 +357,7 @@ public class MainListener {
             return;
         } else {
             Flag flag = FlagManager.getPlotFlagRaw(plot, "use");
-            if ((flag != null) && ((HashSet<PlotBlock>) flag.getValue()).contains(SpongeUtil.getPlotBlock(l.getBlock()))) {
+            if (flag != null && ((HashSet<PlotBlock>) flag.getValue()).contains(SpongeUtil.getPlotBlock(l.getBlock()))) {
                 return;
             }
             MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_INTERACT_OTHER);
@@ -497,7 +496,7 @@ public class MainListener {
                 MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_DESTROY_OTHER);
                 Flag destroy = FlagManager.getPlotFlagRaw(plot, "break");
                 BlockState state = pos.getState();
-                if ((destroy == null) || !((HashSet<PlotBlock>) destroy.getValue()).contains(SpongeUtil.getPlotBlock(state))) {
+                if (destroy == null || !((HashSet<PlotBlock>) destroy.getValue()).contains(SpongeUtil.getPlotBlock(state))) {
                     event.setCancelled(true);
                     return;
                 }
@@ -527,7 +526,7 @@ public class MainListener {
                 } else {
                     Flag destroy = FlagManager.getPlotFlagRaw(plot, "break");
                     BlockState state = l.getBlock();
-                    if ((destroy != null) && ((HashSet<PlotBlock>) destroy.getValue()).contains(SpongeUtil.getPlotBlock(state))) {
+                    if (destroy != null && ((HashSet<PlotBlock>) destroy.getValue()).contains(SpongeUtil.getPlotBlock(state))) {
                         return true;
                     }
                     MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_DESTROY_OTHER);
@@ -578,7 +577,7 @@ public class MainListener {
                 MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_OTHER);
                 Flag BUILD = FlagManager.getPlotFlagRaw(plot, C.FLAG_PLACE.s());
                 BlockState state = pos.getState();
-                if ((BUILD == null) || !((HashSet<PlotBlock>) BUILD.getValue()).contains(SpongeUtil.getPlotBlock(state))) {
+                if (BUILD == null || !((HashSet<PlotBlock>) BUILD.getValue()).contains(SpongeUtil.getPlotBlock(state))) {
                     event.setCancelled(true);
                     return;
                 }
@@ -608,7 +607,7 @@ public class MainListener {
                 } else {
                     Flag build = FlagManager.getPlotFlagRaw(plot, C.FLAG_PLACE.s());
                     BlockState state = l.getBlock();
-                    if ((build != null) && ((HashSet<PlotBlock>) build.getValue()).contains(SpongeUtil.getPlotBlock(state))) {
+                    if (build != null && ((HashSet<PlotBlock>) build.getValue()).contains(SpongeUtil.getPlotBlock(state))) {
                         return true;
                     }
                     MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_OTHER);
diff --git a/Sponge/src/main/java/com/plotsquared/sponge/util/SpongeSchematicHandler.java b/Sponge/src/main/java/com/plotsquared/sponge/util/SpongeSchematicHandler.java
index e1f2031f3..7663e4699 100644
--- a/Sponge/src/main/java/com/plotsquared/sponge/util/SpongeSchematicHandler.java
+++ b/Sponge/src/main/java/com/plotsquared/sponge/util/SpongeSchematicHandler.java
@@ -41,9 +41,9 @@ public class SpongeSchematicHandler extends SchematicHandler {
                 Location bot = corners[0];
                 Location top = corners[1];
 
-                int width = (top.getX() - bot.getX()) + 1;
-                int height = (top.getY() - bot.getY()) + 1;
-                int length = (top.getZ() - bot.getZ()) + 1;
+                int width = top.getX() - bot.getX() + 1;
+                int height = top.getY() - bot.getY() + 1;
+                int length = top.getZ() - bot.getZ() + 1;
                 // Main Schematic tag
                 HashMap<String, Tag> schematic = new HashMap<>();
                 schematic.put("Width", new ShortTag("Width", (short) width));
@@ -110,7 +110,7 @@ public class SpongeSchematicHandler extends SchematicHandler {
                             @Override
                             public void run() {
                                 long start = System.currentTimeMillis();
-                                while (!chunks.isEmpty() && ((System.currentTimeMillis() - start) < 20)) {
+                                while (!chunks.isEmpty() && System.currentTimeMillis() - start < 20) {
                                     // save schematics
                                     ChunkLoc chunk = chunks.remove(0);
                                     int X = chunk.x;
@@ -140,7 +140,7 @@ public class SpongeSchematicHandler extends SchematicHandler {
                                         int i1 = ry * width * length;
                                         for (int z = zzb; z <= zzt; z++) {
                                             int rz = z - p1z;
-                                            int i2 = i1 + (rz * width);
+                                            int i2 = i1 + rz * width;
                                             for (int x = xxb; x <= xxt; x++) {
                                                 int rx = x - p1x;
                                                 int index = i2 + rx;
@@ -216,9 +216,8 @@ public class SpongeSchematicHandler extends SchematicHandler {
                                                     case 189:
                                                     case 190:
                                                     case 191:
-                                                    case 192: {
+                                                    case 192:
                                                         break;
-                                                    }
                                                     case 54:
                                                     case 130:
                                                     case 142:
@@ -253,7 +252,7 @@ public class SpongeSchematicHandler extends SchematicHandler {
                                                     case 29:
                                                     case 33:
                                                     case 151:
-                                                    case 178: {
+                                                    case 178:
                                                         CompoundTag rawTag;
                                                         if (state instanceof Carrier) {
                                                             Carrier chest = (Carrier) state;
@@ -275,10 +274,8 @@ public class SpongeSchematicHandler extends SchematicHandler {
                                                             CompoundTag tileEntityTag = new CompoundTag(values);
                                                             tileEntities.add(tileEntityTag);
                                                         }
-                                                    }
-                                                    default: {
+                                                    default:
                                                         blockData[index] = block.data;
-                                                    }
                                                 }
                                                 blocks[index] = (byte) id;
                                             }
diff --git a/Sponge/src/main/java/com/plotsquared/sponge/util/SpongeSetupUtils.java b/Sponge/src/main/java/com/plotsquared/sponge/util/SpongeSetupUtils.java
index 75f2f4c79..fc53f59f5 100644
--- a/Sponge/src/main/java/com/plotsquared/sponge/util/SpongeSetupUtils.java
+++ b/Sponge/src/main/java/com/plotsquared/sponge/util/SpongeSetupUtils.java
@@ -39,12 +39,12 @@ public class SpongeSetupUtils extends SetupUtils {
             String id = wgm.getId();
             String name = wgm.getName();
             if (wgm instanceof GeneratorWrapper<?>) {
-                generators.put(id, (GeneratorWrapper<?>) wgm);
-                generators.put(name, (GeneratorWrapper<?>) wgm);
+                SetupUtils.generators.put(id, (GeneratorWrapper<?>) wgm);
+                SetupUtils.generators.put(name, (GeneratorWrapper<?>) wgm);
             } else {
                 SpongePlotGenerator wrap = new SpongePlotGenerator(wgm);
-                generators.put(id, wrap);
-                generators.put(name, wrap);
+                SetupUtils.generators.put(id, wrap);
+                SetupUtils.generators.put(name, wrap);
             }
         }
     }
@@ -89,7 +89,7 @@ public class SpongeSetupUtils extends SetupUtils {
                     options.put("generator.type", object.type);
                     options.put("generator.terrain", object.terrain);
                     options.put("generator.plugin", object.plotManager);
-                    if ((object.setupGenerator != null) && !object.setupGenerator.equals(object.plotManager)) {
+                    if (object.setupGenerator != null && !object.setupGenerator.equals(object.plotManager)) {
                         options.put("generator.init", object.setupGenerator);
                     }
                     for (Entry<String, Object> entry : options.entrySet()) {
@@ -105,34 +105,32 @@ public class SpongeSetupUtils extends SetupUtils {
                         }
                     }
                 }
-                GeneratorWrapper<?> gen = generators.get(object.setupGenerator);
-                if ((gen != null) && gen.isFull()) {
+                GeneratorWrapper<?> gen = SetupUtils.generators.get(object.setupGenerator);
+                if (gen != null && gen.isFull()) {
                     object.setupGenerator = null;
                 }
                 break;
             }
-            case 1: {
+            case 1:
                 for (ConfigurationNode step : steps) {
                     worldSection.set(step.getConstant(), step.getValue());
                 }
                 PS.get().config.set("worlds." + world + "." + "generator.type", object.type);
                 PS.get().config.set("worlds." + world + "." + "generator.terrain", object.terrain);
                 PS.get().config.set("worlds." + world + "." + "generator.plugin", object.plotManager);
-                if ((object.setupGenerator != null) && !object.setupGenerator.equals(object.plotManager)) {
+                if (object.setupGenerator != null && !object.setupGenerator.equals(object.plotManager)) {
                     PS.get().config.set("worlds." + world + "." + "generator.init", object.setupGenerator);
                 }
-                GeneratorWrapper<?> gen = generators.get(object.setupGenerator);
-                if ((gen != null) && gen.isFull()) {
+                GeneratorWrapper<?> gen = SetupUtils.generators.get(object.setupGenerator);
+                if (gen != null && gen.isFull()) {
                     object.setupGenerator = null;
                 }
                 break;
-            }
-            case 0: {
+            case 0:
                 for (ConfigurationNode step : steps) {
                     worldSection.set(step.getConstant(), step.getValue());
                 }
                 break;
-            }
         }
         try {
             PS.get().config.save(PS.get().configFile);
@@ -141,7 +139,7 @@ public class SpongeSetupUtils extends SetupUtils {
         }
         if (object.setupGenerator != null) {
             // create world with generator
-            GeneratorWrapper<?> gw = generators.get(object.setupGenerator);
+            GeneratorWrapper<?> gw = SetupUtils.generators.get(object.setupGenerator);
             WorldGeneratorModifier wgm = (WorldGeneratorModifier) gw.getPlatformGenerator();
             
             WorldCreationSettings settings = Sponge.getRegistry().createBuilder(Builder.class)
diff --git a/Sponge/src/main/java/com/plotsquared/sponge/uuid/SpongeLowerOfflineUUIDWrapper.java b/Sponge/src/main/java/com/plotsquared/sponge/uuid/SpongeLowerOfflineUUIDWrapper.java
index 9aa51b914..8cc537d59 100644
--- a/Sponge/src/main/java/com/plotsquared/sponge/uuid/SpongeLowerOfflineUUIDWrapper.java
+++ b/Sponge/src/main/java/com/plotsquared/sponge/uuid/SpongeLowerOfflineUUIDWrapper.java
@@ -19,30 +19,30 @@ public class SpongeLowerOfflineUUIDWrapper extends UUIDWrapper {
     }
     
     @Override
-    public UUID getUUID(final PlotPlayer player) {
+    public UUID getUUID(PlotPlayer player) {
         return getUUID(player.getName());
     }
     
     @Override
-    public UUID getUUID(final OfflinePlotPlayer player) {
+    public UUID getUUID(OfflinePlotPlayer player) {
         return getUUID(player.getName());
     }
     
     @Override
-    public OfflinePlotPlayer getOfflinePlayer(final UUID uuid) {
+    public OfflinePlotPlayer getOfflinePlayer(UUID uuid) {
         String name = UUIDHandler.getName(uuid);
         if (name == null) {
             try {
-                final GameProfile profile = SpongeMain.THIS.getResolver().get(uuid).get();
+                GameProfile profile = SpongeMain.THIS.getResolver().get(uuid).get();
                 if (profile != null) {
                     name = profile.getName().orElse(null);
                 }
-            } catch (final Exception e) {
+            } catch (Exception e) {
                 e.printStackTrace();
             }
         }
         if (name == null) {
-            for (final GameProfile profile : SpongeMain.THIS.getResolver().getCachedProfiles()) {
+            for (GameProfile profile : SpongeMain.THIS.getResolver().getCachedProfiles()) {
                 String tmp = profile.getName().orElse(null);
                 if (tmp != null) {
                     if (getUUID(name).equals(uuid)) {
@@ -52,7 +52,7 @@ public class SpongeLowerOfflineUUIDWrapper extends UUIDWrapper {
                 }
             }
         }
-        final String username = name;
+        String username = name;
         return new OfflinePlotPlayer() {
             @Override
             public boolean isOnline() {
@@ -83,7 +83,7 @@ public class SpongeLowerOfflineUUIDWrapper extends UUIDWrapper {
     }
     
     @Override
-    public UUID getUUID(final String name) {
+    public UUID getUUID(String name) {
         return UUID.nameUUIDFromBytes(("OfflinePlayer:" + name.toLowerCase()).getBytes(Charsets.UTF_8));
     }