diff --git a/config.yml b/config.yml
index e5010d1e..b3faa32f 100644
--- a/config.yml
+++ b/config.yml
@@ -99,10 +99,10 @@ UndisguiseOnWorldChange: false
 ContactMojangServers: true
 
 # Hide players in tab when disguised? This means a disguised player cannot be seen when you press tab! This can be toggled on/off per disguise
-HideDisguisedPlayersTab: false
+HideDisguisedPlayersFromTab: false
 
 # Always show player disguises in tab? The names will continue to appear in tab until the disguise is removed.
-ShowPlayerDisguisesTab: false
+ShowPlayerDisguisesInTab: false
 
 # This will help performance, especially with CPU
 # Due to safety reasons, self disguises can never have their packets disabled.
diff --git a/src/me/libraryaddict/disguise/DisguiseConfig.java b/src/me/libraryaddict/disguise/DisguiseConfig.java
index c8721dd8..c2918b74 100644
--- a/src/me/libraryaddict/disguise/DisguiseConfig.java
+++ b/src/me/libraryaddict/disguise/DisguiseConfig.java
@@ -16,11 +16,12 @@ public class DisguiseConfig {
     private static String disguiseBlownMessage;
     private static int disguiseCloneExpire;
     private static int disguiseEntityExpire;
+    private static boolean displayPlayerDisguisesInTab;
     private static boolean entityAnimationsAdded;
     private static boolean entityStatusEnabled;
     private static boolean equipmentEnabled;
     private static boolean hearSelfDisguise;
-    private static boolean viewSelfDisguise;
+    private static boolean hideDisguisedPlayers;
     private static boolean hidingArmor;
     private static boolean hidingHeldItem;
     private static boolean keepDisguiseEntityDespawn;
@@ -35,32 +36,15 @@ public class DisguiseConfig {
     private static boolean sendVelocity;
     private static boolean showNameAboveHead;
     private static boolean showNameAboveHeadAlwaysVisible;
+    private static boolean stopShulkerDisguisesFromMoving;
     private static boolean targetDisguises;
     private static boolean undisguiseSwitchWorlds;
-    private static boolean stopShulkerDisguisesFromMoving;
     private static String updateMessage = ChatColor.RED + "[LibsDisguises] " + ChatColor.DARK_RED
             + "There is a update ready to be downloaded! You are using " + ChatColor.RED + "v%s" + ChatColor.DARK_RED
             + ", the new version is " + ChatColor.RED + "%s" + ChatColor.DARK_RED + "!";
     private static String updateNotificationPermission;
+    private static boolean viewSelfDisguise;
     private static boolean witherSkullEnabled;
-    private static boolean hideDisguisedPlayers;
-    private static boolean displayPlayerDisguisesInTab;
-
-    public static void setHideDisguisedPlayers(boolean hideDisguisedPlayersInTab) {
-        hideDisguisedPlayers = hideDisguisedPlayersInTab;
-    }
-
-    public static void setShowDisguisedPlayersInTab(boolean displayPlayerDisguisesInTablist) {
-        displayPlayerDisguisesInTab = displayPlayerDisguisesInTablist;
-    }
-
-    public static boolean isHideDisguisedPlayers() {
-        return hideDisguisedPlayers;
-    }
-
-    public static boolean isShowDisguisedPlayersInTab() {
-        return displayPlayerDisguisesInTab;
-    }
 
     public static String getDisguiseBlownMessage() {
         return disguiseBlownMessage;
@@ -155,6 +139,10 @@ public class DisguiseConfig {
         return equipmentEnabled;
     }
 
+    public static boolean isHideDisguisedPlayers() {
+        return hideDisguisedPlayers;
+    }
+
     /**
      * Is the plugin modifying the inventory packets so that players when self disguised, do not see their armor floating around
      */
@@ -221,6 +209,10 @@ public class DisguiseConfig {
         return colorizeSheep;
     }
 
+    public static boolean isShowDisguisedPlayersInTab() {
+        return displayPlayerDisguisesInTab;
+    }
+
     /**
      * Is the sound packets caught and modified
      */
@@ -228,6 +220,10 @@ public class DisguiseConfig {
         return PacketsManager.isHearDisguisesEnabled();
     }
 
+    public static boolean isStopShulkerDisguisesFromMoving() {
+        return stopShulkerDisguisesFromMoving;
+    }
+
     public static boolean isUndisguiseOnWorldChange() {
         return undisguiseSwitchWorlds;
     }
@@ -338,6 +334,10 @@ public class DisguiseConfig {
         }
     }
 
+    public static void setHideDisguisedPlayers(boolean hideDisguisedPlayersInTab) {
+        hideDisguisedPlayers = hideDisguisedPlayersInTab;
+    }
+
     /**
      * Does the plugin appear to remove the item they are holding, to prevent a floating sword when they are viewing self disguise
      */
@@ -409,6 +409,10 @@ public class DisguiseConfig {
         colorizeSheep = color;
     }
 
+    public static void setShowDisguisedPlayersInTab(boolean displayPlayerDisguisesInTablist) {
+        displayPlayerDisguisesInTab = displayPlayerDisguisesInTablist;
+    }
+
     /**
      * Set if the disguises play sounds when hurt
      */
@@ -416,6 +420,10 @@ public class DisguiseConfig {
         PacketsManager.setHearDisguisesListener(isSoundsEnabled);
     }
 
+    public static void setStopShulkerDisguisesFromMoving(boolean stopShulkerDisguisesFromMoving) {
+        DisguiseConfig.stopShulkerDisguisesFromMoving = stopShulkerDisguisesFromMoving;
+    }
+
     public static void setUndisguiseOnWorldChange(boolean isUndisguise) {
         undisguiseSwitchWorlds = isUndisguise;
     }
@@ -428,14 +436,6 @@ public class DisguiseConfig {
         updateNotificationPermission = newPermission;
     }
 
-    public static void setStopShulkerDisguisesFromMoving(boolean stopShulkerDisguisesFromMoving) {
-        DisguiseConfig.stopShulkerDisguisesFromMoving = stopShulkerDisguisesFromMoving;
-    }
-
-    public static boolean isStopShulkerDisguisesFromMoving() {
-        return stopShulkerDisguisesFromMoving;
-    }
-
     /**
      * Disable velocity packets being sent for w/e reason. Maybe you want every ounce of performance you can get?
      *