diff --git a/src/main/java/me/mattstudios/citizenscmd/commands/CMDAdd.java b/src/main/java/me/mattstudios/citizenscmd/commands/CMDAdd.java
index ceb4186..b55e93a 100644
--- a/src/main/java/me/mattstudios/citizenscmd/commands/CMDAdd.java
+++ b/src/main/java/me/mattstudios/citizenscmd/commands/CMDAdd.java
@@ -25,7 +25,12 @@ import org.bukkit.entity.Player;
 
 import java.util.Arrays;
 
-import static me.mattstudios.citizenscmd.utility.Util.*;
+import static me.mattstudios.citizenscmd.utility.Util.HEADER;
+import static me.mattstudios.citizenscmd.utility.Util.color;
+import static me.mattstudios.citizenscmd.utility.Util.getSelectedNpcId;
+import static me.mattstudios.citizenscmd.utility.Util.notDouble;
+import static me.mattstudios.citizenscmd.utility.Util.npcNotSelected;
+
 
 public class CMDAdd extends CommandBase {
 
diff --git a/src/main/java/me/mattstudios/citizenscmd/commands/CMDCooldown.java b/src/main/java/me/mattstudios/citizenscmd/commands/CMDCooldown.java
index 7e8dd94..7cfd91c 100644
--- a/src/main/java/me/mattstudios/citizenscmd/commands/CMDCooldown.java
+++ b/src/main/java/me/mattstudios/citizenscmd/commands/CMDCooldown.java
@@ -23,7 +23,11 @@ import me.mattstudios.citizenscmd.commands.base.CommandBase;
 import me.mattstudios.citizenscmd.paths.Path;
 import org.bukkit.entity.Player;
 
-import static me.mattstudios.citizenscmd.utility.Util.*;
+import static me.mattstudios.citizenscmd.utility.Util.HEADER;
+import static me.mattstudios.citizenscmd.utility.Util.color;
+import static me.mattstudios.citizenscmd.utility.Util.getSelectedNpcId;
+import static me.mattstudios.citizenscmd.utility.Util.notInteger;
+import static me.mattstudios.citizenscmd.utility.Util.npcNotSelected;
 
 public class CMDCooldown extends CommandBase {
 
diff --git a/src/main/java/me/mattstudios/citizenscmd/commands/CMDEdit.java b/src/main/java/me/mattstudios/citizenscmd/commands/CMDEdit.java
index 7d66239..5724255 100644
--- a/src/main/java/me/mattstudios/citizenscmd/commands/CMDEdit.java
+++ b/src/main/java/me/mattstudios/citizenscmd/commands/CMDEdit.java
@@ -26,7 +26,12 @@ import org.bukkit.entity.Player;
 
 import java.util.Arrays;
 
-import static me.mattstudios.citizenscmd.utility.Util.*;
+import static me.mattstudios.citizenscmd.utility.Util.HEADER;
+import static me.mattstudios.citizenscmd.utility.Util.color;
+import static me.mattstudios.citizenscmd.utility.Util.getSelectedNpcId;
+import static me.mattstudios.citizenscmd.utility.Util.notInteger;
+import static me.mattstudios.citizenscmd.utility.Util.npcNotSelected;
+
 
 public class CMDEdit extends CommandBase {
 
diff --git a/src/main/java/me/mattstudios/citizenscmd/commands/CMDList.java b/src/main/java/me/mattstudios/citizenscmd/commands/CMDList.java
index 954d409..d434dd0 100644
--- a/src/main/java/me/mattstudios/citizenscmd/commands/CMDList.java
+++ b/src/main/java/me/mattstudios/citizenscmd/commands/CMDList.java
@@ -28,7 +28,10 @@ import org.bukkit.entity.Player;
 import java.util.ArrayList;
 import java.util.List;
 
-import static me.mattstudios.citizenscmd.utility.Util.*;
+import static me.mattstudios.citizenscmd.utility.Util.HEADER;
+import static me.mattstudios.citizenscmd.utility.Util.color;
+import static me.mattstudios.citizenscmd.utility.Util.getSelectedNpcId;
+import static me.mattstudios.citizenscmd.utility.Util.npcNotSelected;
 
 public class CMDList extends CommandBase {
 
diff --git a/src/main/java/me/mattstudios/citizenscmd/commands/CMDPermission.java b/src/main/java/me/mattstudios/citizenscmd/commands/CMDPermission.java
index e587395..84561bb 100644
--- a/src/main/java/me/mattstudios/citizenscmd/commands/CMDPermission.java
+++ b/src/main/java/me/mattstudios/citizenscmd/commands/CMDPermission.java
@@ -23,7 +23,10 @@ import me.mattstudios.citizenscmd.commands.base.CommandBase;
 import me.mattstudios.citizenscmd.paths.Path;
 import org.bukkit.entity.Player;
 
-import static me.mattstudios.citizenscmd.utility.Util.*;
+import static me.mattstudios.citizenscmd.utility.Util.HEADER;
+import static me.mattstudios.citizenscmd.utility.Util.color;
+import static me.mattstudios.citizenscmd.utility.Util.getSelectedNpcId;
+import static me.mattstudios.citizenscmd.utility.Util.npcNotSelected;
 
 public class CMDPermission extends CommandBase {
 
diff --git a/src/main/java/me/mattstudios/citizenscmd/commands/CMDPrice.java b/src/main/java/me/mattstudios/citizenscmd/commands/CMDPrice.java
index 9c0ac6a..5306136 100644
--- a/src/main/java/me/mattstudios/citizenscmd/commands/CMDPrice.java
+++ b/src/main/java/me/mattstudios/citizenscmd/commands/CMDPrice.java
@@ -23,7 +23,12 @@ import me.mattstudios.citizenscmd.commands.base.CommandBase;
 import me.mattstudios.citizenscmd.paths.Path;
 import org.bukkit.entity.Player;
 
-import static me.mattstudios.citizenscmd.utility.Util.*;
+import static me.mattstudios.citizenscmd.utility.Util.HEADER;
+import static me.mattstudios.citizenscmd.utility.Util.color;
+import static me.mattstudios.citizenscmd.utility.Util.getSelectedNpcId;
+import static me.mattstudios.citizenscmd.utility.Util.notDouble;
+import static me.mattstudios.citizenscmd.utility.Util.npcNotSelected;
+
 
 public class CMDPrice extends CommandBase {
 
diff --git a/src/main/java/me/mattstudios/citizenscmd/commands/CMDRemove.java b/src/main/java/me/mattstudios/citizenscmd/commands/CMDRemove.java
index 1c05e2b..63c1c32 100644
--- a/src/main/java/me/mattstudios/citizenscmd/commands/CMDRemove.java
+++ b/src/main/java/me/mattstudios/citizenscmd/commands/CMDRemove.java
@@ -24,7 +24,12 @@ import me.mattstudios.citizenscmd.paths.Path;
 import me.mattstudios.citizenscmd.utility.EnumTypes;
 import org.bukkit.entity.Player;
 
-import static me.mattstudios.citizenscmd.utility.Util.*;
+import static me.mattstudios.citizenscmd.utility.Util.HEADER;
+import static me.mattstudios.citizenscmd.utility.Util.color;
+import static me.mattstudios.citizenscmd.utility.Util.getSelectedNpcId;
+import static me.mattstudios.citizenscmd.utility.Util.notInteger;
+import static me.mattstudios.citizenscmd.utility.Util.npcNotSelected;
+
 
 public class CMDRemove extends CommandBase {
 
diff --git a/src/main/java/me/mattstudios/citizenscmd/commands/base/CommandBase.java b/src/main/java/me/mattstudios/citizenscmd/commands/base/CommandBase.java
index 7a382a5..8a60564 100644
--- a/src/main/java/me/mattstudios/citizenscmd/commands/base/CommandBase.java
+++ b/src/main/java/me/mattstudios/citizenscmd/commands/base/CommandBase.java
@@ -69,19 +69,19 @@ public abstract class CommandBase {
         return permission;
     }
 
-    boolean allowConsole() {
+    public boolean allowConsole() {
         return allowConsole;
     }
 
-    List<String> getAliases() {
+    public List<String> getAliases() {
         return aliases;
     }
 
-    int getMinimumArguments() {
+    public int getMinimumArguments() {
         return minimumArguments;
     }
 
-    int getMaximumArguments() {
+    public int getMaximumArguments() {
         return maximumArguments;
     }
 }
diff --git a/src/main/java/me/mattstudios/citizenscmd/commands/base/CommandHandler.java b/src/main/java/me/mattstudios/citizenscmd/commands/base/CommandHandler.java
index 3e322ca..61e2e55 100644
--- a/src/main/java/me/mattstudios/citizenscmd/commands/base/CommandHandler.java
+++ b/src/main/java/me/mattstudios/citizenscmd/commands/base/CommandHandler.java
@@ -34,7 +34,10 @@ import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import static me.mattstudios.citizenscmd.utility.Util.*;
+import static me.mattstudios.citizenscmd.utility.Util.HEADER;
+import static me.mattstudios.citizenscmd.utility.Util.color;
+import static me.mattstudios.citizenscmd.utility.Util.getTabCompleteArgs;
+import static me.mattstudios.citizenscmd.utility.Util.npcNotSelectedNM;
 
 /**
  * Thank you GlareMasters for creating this class!
@@ -70,9 +73,9 @@ public class CommandHandler implements CommandExecutor, TabCompleter, IHandler {
         }
 
         if (args.length == 0 || args[0].isEmpty()) {
-            if (sender.hasPermission("citizenscmd.npcmd"))
-                if (sender instanceof Player)
-                    getCommand().execute((Player) sender, args);
+            if (sender.hasPermission("citizenscmd.npcmd") && sender instanceof Player) {
+                getCommand().execute((Player) sender, args);
+            }
             return true;
         }
 
@@ -190,9 +193,8 @@ public class CommandHandler implements CommandExecutor, TabCompleter, IHandler {
                             else if (args[2].equalsIgnoreCase("right"))
                                 return getCommandNames(subCMD, args, 4, (Player) sender);
                         }
-                        if (args.length == 5) {
-                            if (args[1].equalsIgnoreCase("perm"))
-                                return getCommandNames(subCMD, args, 5, (Player) sender);
+                        if (args.length == 5 && args[1].equalsIgnoreCase("perm")) {
+                            return getCommandNames(subCMD, args, 5, (Player) sender);
                         }
                         break;
                 }
@@ -213,7 +215,7 @@ public class CommandHandler implements CommandExecutor, TabCompleter, IHandler {
      */
     private List<String> getCommandNames(String subCMD, String[] args, int arg, Player player) {
         List<String> commandNames = new ArrayList<>();
-        String[][] argsComplete = getTabCompleteArgs(plugin, subCMD, player);
+        String[][] argsComplete = getTabCompleteArgs(plugin, subCMD.toLowerCase(), player);
 
         if (!args[arg - 1].equals("")) {
             for (String commandName : argsComplete[arg - 1]) {
diff --git a/src/main/java/me/mattstudios/citizenscmd/utility/TimeUtil.java b/src/main/java/me/mattstudios/citizenscmd/utility/TimeUtil.java
index 1b8e28f..4852fe1 100644
--- a/src/main/java/me/mattstudios/citizenscmd/utility/TimeUtil.java
+++ b/src/main/java/me/mattstudios/citizenscmd/utility/TimeUtil.java
@@ -71,16 +71,11 @@ public class TimeUtil {
         }
 
         switch (format) {
-            case SHORT:
-                dayFormat = shorts[3];
-                hourFormat = shorts[2];
-                minuteFormat = shorts[1];
-                secondFormat = shorts[0];
-                break;
             case MEDIUM:
                 String[] mediumsAfter = new String[4];
                 String[] mediumsPlurals = new String[4];
                 Pattern patternMediums = Pattern.compile("([^]]*)\\(([^]]*)\\)");
+
                 for (int i = 0; i < mediums.length; i++) {
                     if (mediums[i].contains("(") && mediums[i].contains(")")) {
                         Matcher matcher = patternMediums.matcher(mediums[i]);
@@ -93,6 +88,7 @@ public class TimeUtil {
                         mediumsPlurals[i] = "";
                     }
                 }
+
                 dayFormat = " " + mediumsAfter[3];
                 dayPlural = mediumsPlurals[3];
                 hourFormat = " " + mediumsAfter[2];
@@ -102,10 +98,12 @@ public class TimeUtil {
                 secondFormat = " " + mediumsAfter[0];
                 secondPlural = mediumsPlurals[0];
                 break;
+
             case FULL:
                 String[] fullsAfter = new String[4];
                 String[] fullsPlurals = new String[4];
                 Pattern patternFulls = Pattern.compile("([^]]*)\\(([^]]*)\\)");
+
                 for (int i = 0; i < fulls.length; i++) {
                     if (fulls[i].contains("(") && fulls[i].contains(")")) {
                         Matcher matcher = patternFulls.matcher(fulls[i]);
@@ -118,6 +116,7 @@ public class TimeUtil {
                         fullsPlurals[i] = "";
                     }
                 }
+
                 dayFormat = " " + fullsAfter[3];
                 dayPlural = fullsPlurals[3];
                 hourFormat = " " + fullsAfter[2];
@@ -127,6 +126,13 @@ public class TimeUtil {
                 secondFormat = " " + fullsAfter[0];
                 secondPlural = fullsPlurals[0];
                 break;
+
+            default:
+                dayFormat = shorts[3];
+                hourFormat = shorts[2];
+                minuteFormat = shorts[1];
+                secondFormat = shorts[0];
+                break;
         }
 
         if (seconds < 60) {
diff --git a/src/main/java/me/mattstudios/citizenscmd/utility/Util.java b/src/main/java/me/mattstudios/citizenscmd/utility/Util.java
index e08965b..65b056b 100644
--- a/src/main/java/me/mattstudios/citizenscmd/utility/Util.java
+++ b/src/main/java/me/mattstudios/citizenscmd/utility/Util.java
@@ -157,7 +157,7 @@ public class Util {
     public static String[][] getTabCompleteArgs(CitizensCMD plugin, String subCMD, Player player) {
         String[][] argComplete = new String[5][];
 
-        switch (subCMD.toLowerCase()) {
+        switch (subCMD) {
             case "add":
                 argComplete[0] = new String[]{"console", "none", "permission", "server", "message", "sound"};
                 argComplete[1] = getSoundsList();
@@ -360,10 +360,8 @@ public class Util {
                     getScheduler().runTaskLater(plugin, () -> {
                         Pattern pattern = Pattern.compile("(\\w+)\\s([\\d.]+)\\s([\\d.]+)");
                         Matcher matcher = pattern.matcher(commands.get(finalI));
-                        if (matcher.find()) {
-                            if (soundExists(matcher.group(1))) {
-                                player.playSound(player.getLocation(), Sound.valueOf(matcher.group(1)), Float.parseFloat(matcher.group(2)), Float.parseFloat(matcher.group(3)));
-                            }
+                        if (matcher.find() && soundExists(matcher.group(1))) {
+                            player.playSound(player.getLocation(), Sound.valueOf(matcher.group(1)), Float.parseFloat(matcher.group(2)), Float.parseFloat(matcher.group(3)));
                         }
                     }, (int) delay * 20);
                     break;
@@ -374,6 +372,7 @@ public class Util {
                         player.chat("/" + commands.get(finalI));
                         plugin.getPermissionsManager().unsetPermission(player, permissions.get(finalI));
                     }, (int) delay * 20);
+                    break;
             }
         }
     }