diff --git a/src/main/java/us/tastybento/bskyblock/database/managers/PlayersManager.java b/src/main/java/us/tastybento/bskyblock/database/managers/PlayersManager.java
index b09f80e0b..7dd703c65 100644
--- a/src/main/java/us/tastybento/bskyblock/database/managers/PlayersManager.java
+++ b/src/main/java/us/tastybento/bskyblock/database/managers/PlayersManager.java
@@ -7,8 +7,8 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Optional;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
 
diff --git a/src/main/java/us/tastybento/bskyblock/database/objects/Island.java b/src/main/java/us/tastybento/bskyblock/database/objects/Island.java
index 323b4fe08..28644948f 100755
--- a/src/main/java/us/tastybento/bskyblock/database/objects/Island.java
+++ b/src/main/java/us/tastybento/bskyblock/database/objects/Island.java
@@ -1,7 +1,11 @@
 package us.tastybento.bskyblock.database.objects;
 
-import java.util.*;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Set;
+import java.util.UUID;
 
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
diff --git a/src/main/java/us/tastybento/bskyblock/database/objects/Players.java b/src/main/java/us/tastybento/bskyblock/database/objects/Players.java
index 68e54ea30..fd2374906 100755
--- a/src/main/java/us/tastybento/bskyblock/database/objects/Players.java
+++ b/src/main/java/us/tastybento/bskyblock/database/objects/Players.java
@@ -1,6 +1,10 @@
 package us.tastybento.bskyblock.database.objects;
 
-import java.util.*;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
 
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
diff --git a/src/main/java/us/tastybento/bskyblock/managers/CommandsManager.java b/src/main/java/us/tastybento/bskyblock/managers/CommandsManager.java
index 4c5e45fa8..8955561cd 100644
--- a/src/main/java/us/tastybento/bskyblock/managers/CommandsManager.java
+++ b/src/main/java/us/tastybento/bskyblock/managers/CommandsManager.java
@@ -4,15 +4,16 @@ import java.lang.reflect.Field;
 import java.util.HashMap;
 
 import org.bukkit.Bukkit;
-import org.bukkit.command.Command;
 import org.bukkit.command.CommandMap;
 
+import us.tastybento.bskyblock.api.commands.CompositeCommand;
+
 public final class CommandsManager {
 
     private static final boolean DEBUG = false;
-    private HashMap<String, Command> commands = new HashMap<>();
+    private HashMap<String, CompositeCommand> commands = new HashMap<>();
 
-    public void registerCommand(Command command) {
+    public void registerCommand(CompositeCommand command) {
         if (DEBUG) {
             Bukkit.getLogger().info("DEBUG: registering command - " + command.getLabel());
         }
@@ -29,7 +30,7 @@ public final class CommandsManager {
         }
     }
 
-    public Command getCommand(String command) {
+    public CompositeCommand getCommand(String command) {
         return commands.get(command);
     }
 
diff --git a/src/test/java/us/tastybento/bskyblock/managers/RanksManagerTest.java b/src/test/java/us/tastybento/bskyblock/managers/RanksManagerTest.java
index c3d52b48b..286f14150 100644
--- a/src/test/java/us/tastybento/bskyblock/managers/RanksManagerTest.java
+++ b/src/test/java/us/tastybento/bskyblock/managers/RanksManagerTest.java
@@ -5,15 +5,12 @@ package us.tastybento.bskyblock.managers;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Map.Entry;
 
 import org.junit.Before;
 import org.junit.Test;