diff --git a/src/net/nuggetmc/ai/PlayerAI.java b/src/net/nuggetmc/ai/PlayerAI.java
index aa0c4e7..ce7cd64 100644
--- a/src/net/nuggetmc/ai/PlayerAI.java
+++ b/src/net/nuggetmc/ai/PlayerAI.java
@@ -14,14 +14,14 @@ public class PlayerAI extends JavaPlugin {
 
     private static PlayerAI instance;
 
-    private final CommandHandler HANDLER;
-    private final NPCManager MANAGER;
+    private final CommandHandler handler;
+    private final NPCManager manager;
 
     public PlayerAI() {
         instance = this;
 
-        this.HANDLER = new CommandHandler();
-        this.MANAGER = new NPCManager(this);
+        this.handler = new CommandHandler();
+        this.manager = new NPCManager(this);
     }
 
     public static PlayerAI getInstance() {
@@ -29,29 +29,29 @@ public class PlayerAI extends JavaPlugin {
     }
 
     public CommandHandler getHandler() {
-        return HANDLER;
+        return handler;
     }
 
     public NPCManager getManager() {
-        return MANAGER;
+        return manager;
     }
 
     @Override
     public void onEnable() {
-        getServer().getPluginManager().registerEvents(MANAGER, this);
+        getServer().getPluginManager().registerEvents(manager, this);
         registerCommands();
 
-        MANAGER.connectAll();
+        manager.connectAll();
     }
 
     @Override
     public void onDisable() {
-        MANAGER.reset();
-        MANAGER.disconnectAll();
+        manager.reset();
+        manager.disconnectAll();
     }
 
     private void registerCommands() {
-        HANDLER.register(new CommandInterface[] {
+        handler.register(new CommandInterface[] {
             new CreateCommand(),
             new InfoCommand(),
             new DebugCommand(),
@@ -61,8 +61,8 @@ public class PlayerAI extends JavaPlugin {
         PluginCommand command = getCommand("playerai");
 
         if (command != null) {
-            command.setExecutor(HANDLER);
-            command.setTabCompleter(HANDLER);
+            command.setExecutor(handler);
+            command.setTabCompleter(handler);
         }
     }
 }
diff --git a/src/net/nuggetmc/ai/cmd/CommandHandler.java b/src/net/nuggetmc/ai/cmd/CommandHandler.java
index ecd4547..d1be9ea 100644
--- a/src/net/nuggetmc/ai/cmd/CommandHandler.java
+++ b/src/net/nuggetmc/ai/cmd/CommandHandler.java
@@ -10,13 +10,13 @@ import java.util.*;
 
 public class CommandHandler implements CommandExecutor, TabCompleter {
 
-    private final Map<String, CommandInterface> COMMANDS = new HashMap<>();
+    private final Map<String, CommandInterface> commands = new HashMap<>();
 
-    private final String PREFIX = "bot";
+    private final String prefix = "bot";
 
     public void register(CommandInterface[] subCmds) {
         for (CommandInterface cmd : subCmds) {
-            COMMANDS.put(cmd.getName(), cmd);
+            commands.put(cmd.getName(), cmd);
         }
     }
 
@@ -26,11 +26,11 @@ public class CommandHandler implements CommandExecutor, TabCompleter {
     }
 
     private boolean exists(String name) {
-        return COMMANDS.containsKey(name.toLowerCase());
+        return commands.containsKey(name.toLowerCase());
     }
 
     private CommandInterface getExecutor(String name) {
-        return COMMANDS.get(name.toLowerCase());
+        return commands.get(name.toLowerCase());
     }
 
     public String nonPlayerMsg() {
@@ -38,7 +38,7 @@ public class CommandHandler implements CommandExecutor, TabCompleter {
     }
 
     public String usageMsg(CommandInterface subCmd) {
-        return ChatColor.RED + "Invalid arguments!\nUsage: /" + PREFIX + " " + subCmd.getName() + " " + subCmd.getUsage();
+        return ChatColor.RED + "Invalid arguments!\nUsage: /" + prefix + " " + subCmd.getName() + " " + subCmd.getUsage();
     }
 
     private void sendCmdInfo(CommandSender sender) {
@@ -46,8 +46,8 @@ public class CommandHandler implements CommandExecutor, TabCompleter {
 
         sender.sendMessage(ChatColor.GOLD + "PlayerAI" + ChatColor.GRAY + " [" + ChatColor.RED + "v1.0" + ChatColor.GRAY + "]");
 
-        for (Map.Entry<String, CommandInterface> entry : COMMANDS.entrySet()) {
-            sender.sendMessage(ChatColor.GRAY + " ▪ " + ChatColor.YELLOW + "/" + PREFIX + " " + entry.getKey() + ChatColor.GRAY + " ▪ "
+        for (Map.Entry<String, CommandInterface> entry : commands.entrySet()) {
+            sender.sendMessage(ChatColor.GRAY + " ▪ " + ChatColor.YELLOW + "/" + prefix + " " + entry.getKey() + ChatColor.GRAY + " ▪ "
                     + ChatColor.RESET +  entry.getValue().getDescription());
         }
 
@@ -74,7 +74,7 @@ public class CommandHandler implements CommandExecutor, TabCompleter {
 
         switch (n) {
             case 1:
-                groupnames = new ArrayList<>(COMMANDS.keySet());
+                groupnames = new ArrayList<>(commands.keySet());
                 String arg = args[n - 1];
 
                 if (!isEmptyTab(arg)) {
diff --git a/src/net/nuggetmc/ai/cmd/commands/DebugCommand.java b/src/net/nuggetmc/ai/cmd/commands/DebugCommand.java
index c42265c..07885f4 100644
--- a/src/net/nuggetmc/ai/cmd/commands/DebugCommand.java
+++ b/src/net/nuggetmc/ai/cmd/commands/DebugCommand.java
@@ -12,30 +12,30 @@ import java.util.Set;
 
 public class DebugCommand implements CommandInterface {
 
-    private final CommandHandler HANDLER;
+    private final CommandHandler handler;
 
-    private final String NAME;
-    private final String DESCRIPTION = "Debug NPC stats.";
-    private final String CMD_ARGS = "";
+    private final String name;
+    private final String description = "Debug NPC stats.";
+    private final String cmdArgs = "";
 
     public DebugCommand() {
-        this.HANDLER = PlayerAI.getInstance().getHandler();
-        this.NAME = HANDLER.fetchName(this);
+        this.handler = PlayerAI.getInstance().getHandler();
+        this.name = handler.fetchName(this);
     }
 
     @Override
     public String getName() {
-        return NAME;
+        return name;
     }
 
     @Override
     public String getDescription() {
-        return DESCRIPTION;
+        return description;
     }
 
     @Override
     public String getUsage() {
-        return CMD_ARGS;
+        return cmdArgs;
     }
 
     private boolean active = false;
diff --git a/src/net/nuggetmc/ai/cmd/commands/InfoCommand.java b/src/net/nuggetmc/ai/cmd/commands/InfoCommand.java
index 053a737..58eec43 100644
--- a/src/net/nuggetmc/ai/cmd/commands/InfoCommand.java
+++ b/src/net/nuggetmc/ai/cmd/commands/InfoCommand.java
@@ -8,30 +8,30 @@ import org.bukkit.command.CommandSender;
 
 public class InfoCommand implements CommandInterface {
 
-    private final CommandHandler HANDLER;
+    private final CommandHandler handler;
 
-    private final String NAME;
-    private final String DESCRIPTION = "Information about loaded NPCs.";
-    private final String CMD_ARGS = "";
+    private final String name;
+    private final String description = "Information about loaded NPCs.";
+    private final String cmdArgs = "";
 
     public InfoCommand() {
-        this.HANDLER = PlayerAI.getInstance().getHandler();
-        this.NAME = HANDLER.fetchName(this);
+        this.handler = PlayerAI.getInstance().getHandler();
+        this.name = handler.fetchName(this);
     }
 
     @Override
     public String getName() {
-        return NAME;
+        return name;
     }
 
     @Override
     public String getDescription() {
-        return DESCRIPTION;
+        return description;
     }
 
     @Override
     public String getUsage() {
-        return CMD_ARGS;
+        return cmdArgs;
     }
 
     @Override
diff --git a/src/net/nuggetmc/ai/cmd/commands/ResetCommand.java b/src/net/nuggetmc/ai/cmd/commands/ResetCommand.java
index a3c86b6..57dbdc6 100644
--- a/src/net/nuggetmc/ai/cmd/commands/ResetCommand.java
+++ b/src/net/nuggetmc/ai/cmd/commands/ResetCommand.java
@@ -13,43 +13,43 @@ import java.util.Locale;
 
 public class ResetCommand implements CommandInterface {
 
-    private final PlayerAI INSTANCE;
+    private final PlayerAI plugin;
 
-    private final CommandHandler HANDLER;
-    private final NPCManager MANAGER;
+    private final CommandHandler handler;
+    private final NPCManager manager;
 
-    private final String NAME;
-    private final String DESCRIPTION = "Information about loaded NPCs.";
-    private final String CMD_ARGS = "";
+    private final String name;
+    private final String description = "Information about loaded NPCs.";
+    private final String cmdArgs = "";
 
     public ResetCommand() {
-        this.INSTANCE = PlayerAI.getInstance();
-        this.HANDLER = INSTANCE.getHandler();
-        this.MANAGER = INSTANCE.getManager();
-        this.NAME = HANDLER.fetchName(this);
+        this.plugin = PlayerAI.getInstance();
+        this.handler = plugin.getHandler();
+        this.manager = plugin.getManager();
+        this.name = handler.fetchName(this);
     }
 
     @Override
     public String getName() {
-        return NAME;
+        return name;
     }
 
     @Override
     public String getDescription() {
-        return DESCRIPTION;
+        return description;
     }
 
     @Override
     public String getUsage() {
-        return CMD_ARGS;
+        return cmdArgs;
     }
 
     @Override
     public void onCommand(CommandSender sender, Command cmd, String label, String[] args) {
         sender.sendMessage("Removing every NPC...");
-        int size = MANAGER.fetch().size();
+        int size = manager.fetch().size();
 
-        MANAGER.reset();
+        manager.reset();
 
         String en;
         if (size == 1) {
diff --git a/src/net/nuggetmc/ai/npc/NPC.java b/src/net/nuggetmc/ai/npc/NPC.java
index a70ab89..f614979 100644
--- a/src/net/nuggetmc/ai/npc/NPC.java
+++ b/src/net/nuggetmc/ai/npc/NPC.java
@@ -25,7 +25,7 @@ public class NPC extends EntityPlayer {
 
     private byte kbTicks;
 
-    private final double REGEN_AMOUNT = 0.05;
+    private final double regenAmount = 0.05;
 
     public NPC(MinecraftServer minecraftServer, WorldServer worldServer, GameProfile profile, PlayerInteractManager manager) {
         super(minecraftServer, worldServer, profile, manager);
@@ -116,8 +116,8 @@ public class NPC extends EntityPlayer {
         double maxHealth = playerNPC.getAttribute(Attribute.GENERIC_MAX_HEALTH).getDefaultValue();
         double amount;
 
-        if (health < maxHealth - REGEN_AMOUNT) {
-            amount = health + REGEN_AMOUNT;
+        if (health < maxHealth - regenAmount) {
+            amount = health + regenAmount;
         } else {
             amount = maxHealth;
         }
@@ -138,7 +138,7 @@ public class NPC extends EntityPlayer {
         this.move(EnumMoveType.SELF, new Vec3D(velocity.getX(), velocity.getY(), velocity.getZ()));
     }
 
-    private final double OFFSET = 0.05;
+    private final double bbOffset = 0.05;
 
     public boolean predictGround() {
         double vy = velocity.getY();
@@ -153,13 +153,13 @@ public class NPC extends EntityPlayer {
         AxisAlignedBB box = getBoundingBox();
 
         double[] xVals = new double[] {
-            box.minX + OFFSET,
-            box.maxX - OFFSET
+            box.minX + bbOffset,
+            box.maxX - bbOffset
         };
 
         double[] zVals = new double[] {
-            box.minZ + OFFSET,
-            box.maxZ - OFFSET
+            box.minZ + bbOffset,
+            box.maxZ - bbOffset
         };
 
         for (double x : xVals) {
diff --git a/src/net/nuggetmc/ai/npc/NPCManager.java b/src/net/nuggetmc/ai/npc/NPCManager.java
index 023868b..4704381 100644
--- a/src/net/nuggetmc/ai/npc/NPCManager.java
+++ b/src/net/nuggetmc/ai/npc/NPCManager.java
@@ -24,18 +24,18 @@ public class NPCManager implements Listener {
 
     private PlayerAI plugin;
 
-    private final Set<NPC> NPCS = new HashSet<>();
-    private final Map<Integer, NPC> NPC_CONNECTIONS = new HashMap<>();
+    private final Set<NPC> npcs = new HashSet<>();
+    private final Map<Integer, NPC> npcConnections = new HashMap<>();
 
     public Set<NPC> fetch() {
-        return NPCS;
+        return npcs;
     }
 
     public void add(NPC npc) {
-        NPCS.add(npc);
+        npcs.add(npc);
 
         Bukkit.getScheduler().runTaskLater(PlayerAI.getInstance(), () -> {
-            NPC_CONNECTIONS.put(npc.getId(), npc);
+            npcConnections.put(npc.getId(), npc);
         }, 10);
     }
 
@@ -44,19 +44,19 @@ public class NPCManager implements Listener {
     }
 
     public void reset() {
-        for (NPC npc : NPCS) {
+        for (NPC npc : npcs) {
             npc.despawn();
         }
 
-        NPCS.clear();
-        NPC_CONNECTIONS.clear();
+        npcs.clear();
+        npcConnections.clear();
     }
 
     @EventHandler
     public void onJoin(PlayerJoinEvent event) {
         PlayerConnection connection = ((CraftPlayer) event.getPlayer()).getHandle().playerConnection;
 
-        for (NPC npc : NPCS) {
+        for (NPC npc : npcs) {
             npc.render(connection, true);
         }
 
@@ -128,7 +128,7 @@ public class NPCManager implements Listener {
         if (!(obj instanceof Integer)) return;
         int n = (int) obj;
 
-        NPC npc = NPC_CONNECTIONS.get(n);
+        NPC npc = npcConnections.get(n);
         if (npc == null) return;
 
         connection.sendPacket(new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.ADD_PLAYER, npc));