diff --git a/src/main/java/com/github/arthurfiorette/sinklibrary/command/BaseCommand.java b/src/main/java/com/github/arthurfiorette/sinklibrary/command/BaseCommand.java
index f360f134..d885f15d 100644
--- a/src/main/java/com/github/arthurfiorette/sinklibrary/command/BaseCommand.java
+++ b/src/main/java/com/github/arthurfiorette/sinklibrary/command/BaseCommand.java
@@ -1,15 +1,13 @@
 package com.github.arthurfiorette.sinklibrary.command;
 
+import com.github.arthurfiorette.sinklibrary.command.wrapper.CommandInfo.CommandInfoBuilder;
+import com.github.arthurfiorette.sinklibrary.core.BasePlugin;
+import com.github.arthurfiorette.sinklibrary.interfaces.BaseComponent;
 import java.util.Collection;
 import java.util.List;
-
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.PluginIdentifiableCommand;
 
-import com.github.arthurfiorette.sinklibrary.command.wrapper.CommandInfo.CommandInfoBuilder;
-import com.github.arthurfiorette.sinklibrary.core.BasePlugin;
-import com.github.arthurfiorette.sinklibrary.interfaces.BaseComponent;
-
 public interface BaseCommand extends BaseComponent, PluginIdentifiableCommand {
   void handle(final CommandSender sender, final Collection<String> args);
 
diff --git a/src/main/java/com/github/arthurfiorette/sinklibrary/command/CommandStorage.java b/src/main/java/com/github/arthurfiorette/sinklibrary/command/CommandStorage.java
index 6e4a1f7c..fbed65a9 100644
--- a/src/main/java/com/github/arthurfiorette/sinklibrary/command/CommandStorage.java
+++ b/src/main/java/com/github/arthurfiorette/sinklibrary/command/CommandStorage.java
@@ -1,13 +1,11 @@
 package com.github.arthurfiorette.sinklibrary.command;
 
-import org.bukkit.command.CommandMap;
-
 import com.github.arthurfiorette.sinklibrary.command.reflection.CommandReflector;
 import com.github.arthurfiorette.sinklibrary.command.reflection.SimpleCommandReflector;
 import com.github.arthurfiorette.sinklibrary.core.BasePlugin;
 import com.github.arthurfiorette.sinklibrary.interfaces.BaseService;
-
 import lombok.*;
+import org.bukkit.command.CommandMap;
 
 @RequiredArgsConstructor
 public abstract class CommandStorage implements BaseService {
diff --git a/src/main/java/com/github/arthurfiorette/sinklibrary/command/CommandUtils.java b/src/main/java/com/github/arthurfiorette/sinklibrary/command/CommandUtils.java
index 6b51bb25..42f46dc8 100644
--- a/src/main/java/com/github/arthurfiorette/sinklibrary/command/CommandUtils.java
+++ b/src/main/java/com/github/arthurfiorette/sinklibrary/command/CommandUtils.java
@@ -3,7 +3,6 @@
 import com.github.arthurfiorette.sinklibrary.command.wrapper.CommandInfo;
 import com.github.arthurfiorette.sinklibrary.command.wrapper.CommandInfo.CommandInfoBuilder;
 import com.github.arthurfiorette.sinklibrary.command.wrapper.CommandWrapper;
-
 import lombok.experimental.UtilityClass;
 
 @UtilityClass
diff --git a/src/main/java/com/github/arthurfiorette/sinklibrary/command/reflection/CommandReflector.java b/src/main/java/com/github/arthurfiorette/sinklibrary/command/reflection/CommandReflector.java
index e069b34a..89d457f6 100644
--- a/src/main/java/com/github/arthurfiorette/sinklibrary/command/reflection/CommandReflector.java
+++ b/src/main/java/com/github/arthurfiorette/sinklibrary/command/reflection/CommandReflector.java
@@ -1,10 +1,9 @@
 package com.github.arthurfiorette.sinklibrary.command.reflection;
 
-import org.bukkit.command.CommandMap;
-import org.bukkit.plugin.PluginManager;
-
 import com.github.arthurfiorette.sinklibrary.exceptions.EnablingException;
 import com.github.arthurfiorette.sinklibrary.interfaces.BaseComponent;
+import org.bukkit.command.CommandMap;
+import org.bukkit.plugin.PluginManager;
 
 public interface CommandReflector extends BaseComponent {
   void enable() throws EnablingException;
diff --git a/src/main/java/com/github/arthurfiorette/sinklibrary/command/reflection/SimpleCommandReflector.java b/src/main/java/com/github/arthurfiorette/sinklibrary/command/reflection/SimpleCommandReflector.java
index b9b1daa4..534b1f0d 100644
--- a/src/main/java/com/github/arthurfiorette/sinklibrary/command/reflection/SimpleCommandReflector.java
+++ b/src/main/java/com/github/arthurfiorette/sinklibrary/command/reflection/SimpleCommandReflector.java
@@ -1,15 +1,12 @@
 package com.github.arthurfiorette.sinklibrary.command.reflection;
 
-import java.lang.reflect.Field;
-
-import org.bukkit.command.CommandMap;
-import org.bukkit.plugin.PluginManager;
-
 import com.github.arthurfiorette.sinklibrary.core.BasePlugin;
 import com.github.arthurfiorette.sinklibrary.exceptions.EnablingException;
-
+import java.lang.reflect.Field;
 import lombok.Getter;
 import lombok.NonNull;
+import org.bukkit.command.CommandMap;
+import org.bukkit.plugin.PluginManager;
 
 public class SimpleCommandReflector implements CommandReflector {
 
diff --git a/src/main/java/com/github/arthurfiorette/sinklibrary/command/wrapper/CommandInfo.java b/src/main/java/com/github/arthurfiorette/sinklibrary/command/wrapper/CommandInfo.java
index a40e1a16..75f93ce2 100644
--- a/src/main/java/com/github/arthurfiorette/sinklibrary/command/wrapper/CommandInfo.java
+++ b/src/main/java/com/github/arthurfiorette/sinklibrary/command/wrapper/CommandInfo.java
@@ -2,10 +2,8 @@
 
 import java.util.ArrayList;
 import java.util.List;
-
-import org.bukkit.ChatColor;
-
 import lombok.*;
+import org.bukkit.ChatColor;
 
 @Builder
 public class CommandInfo {
diff --git a/src/main/java/com/github/arthurfiorette/sinklibrary/command/wrapper/CommandWrapper.java b/src/main/java/com/github/arthurfiorette/sinklibrary/command/wrapper/CommandWrapper.java
index c7c54ece..4a3a9550 100644
--- a/src/main/java/com/github/arthurfiorette/sinklibrary/command/wrapper/CommandWrapper.java
+++ b/src/main/java/com/github/arthurfiorette/sinklibrary/command/wrapper/CommandWrapper.java
@@ -1,18 +1,15 @@
 package com.github.arthurfiorette.sinklibrary.command.wrapper;
 
-import java.util.List;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-
 import com.github.arthurfiorette.sinklibrary.command.BaseCommand;
 import com.github.arthurfiorette.sinklibrary.command.CommandUtils;
 import com.github.arthurfiorette.sinklibrary.tuple.Pair;
 import com.github.arthurfiorette.sinklibrary.tuple.ValidPair;
 import com.google.common.collect.Lists;
-
+import java.util.List;
 import lombok.Getter;
 import lombok.NonNull;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
 
 public class CommandWrapper extends Command {
 
diff --git a/src/main/java/com/github/arthurfiorette/sinklibrary/components/SimpleComponentManager.java b/src/main/java/com/github/arthurfiorette/sinklibrary/components/SimpleComponentManager.java
index e0672e5b..105ec204 100644
--- a/src/main/java/com/github/arthurfiorette/sinklibrary/components/SimpleComponentManager.java
+++ b/src/main/java/com/github/arthurfiorette/sinklibrary/components/SimpleComponentManager.java
@@ -1,14 +1,12 @@
 package com.github.arthurfiorette.sinklibrary.components;
 
-import java.util.LinkedHashMap;
-import java.util.Map;
-
 import com.github.arthurfiorette.sinklibrary.core.SinkPlugin;
 import com.github.arthurfiorette.sinklibrary.exceptions.ComponentNotRegisteredException;
 import com.github.arthurfiorette.sinklibrary.exceptions.IllegalComponentException;
 import com.github.arthurfiorette.sinklibrary.interfaces.*;
 import com.github.arthurfiorette.sinklibrary.logging.Level;
-
+import java.util.LinkedHashMap;
+import java.util.Map;
 import lombok.Getter;
 import lombok.NonNull;
 
diff --git a/src/main/java/com/github/arthurfiorette/sinklibrary/config/BaseConfig.java b/src/main/java/com/github/arthurfiorette/sinklibrary/config/BaseConfig.java
index efedb399..d320e829 100644
--- a/src/main/java/com/github/arthurfiorette/sinklibrary/config/BaseConfig.java
+++ b/src/main/java/com/github/arthurfiorette/sinklibrary/config/BaseConfig.java
@@ -1,11 +1,9 @@
 package com.github.arthurfiorette.sinklibrary.config;
 
-import java.io.File;
-
-import org.bukkit.configuration.file.FileConfiguration;
-
 import com.github.arthurfiorette.sinklibrary.core.BasePlugin;
 import com.github.arthurfiorette.sinklibrary.interfaces.BaseComponent;
+import java.io.File;
+import org.bukkit.configuration.file.FileConfiguration;
 
 public interface BaseConfig extends BaseComponent {
   /**
diff --git a/src/main/java/com/github/arthurfiorette/sinklibrary/config/CustomConfig.java b/src/main/java/com/github/arthurfiorette/sinklibrary/config/CustomConfig.java
index 60bbd29e..46f558f2 100644
--- a/src/main/java/com/github/arthurfiorette/sinklibrary/config/CustomConfig.java
+++ b/src/main/java/com/github/arthurfiorette/sinklibrary/config/CustomConfig.java
@@ -1,14 +1,11 @@
 package com.github.arthurfiorette.sinklibrary.config;
 
+import com.github.arthurfiorette.sinklibrary.core.BasePlugin;
 import java.io.File;
-
+import lombok.Getter;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.configuration.file.YamlConfiguration;
 
-import com.github.arthurfiorette.sinklibrary.core.BasePlugin;
-
-import lombok.Getter;
-
 public class CustomConfig implements BaseConfig {
 
   @Getter
diff --git a/src/main/java/com/github/arthurfiorette/sinklibrary/config/PluginConfig.java b/src/main/java/com/github/arthurfiorette/sinklibrary/config/PluginConfig.java
index 6ec363fe..35a9149c 100644
--- a/src/main/java/com/github/arthurfiorette/sinklibrary/config/PluginConfig.java
+++ b/src/main/java/com/github/arthurfiorette/sinklibrary/config/PluginConfig.java
@@ -1,12 +1,9 @@
 package com.github.arthurfiorette.sinklibrary.config;
 
-import java.io.File;
-
-import org.bukkit.configuration.file.FileConfiguration;
-
 import com.github.arthurfiorette.sinklibrary.core.BasePlugin;
-
+import java.io.File;
 import lombok.Getter;
+import org.bukkit.configuration.file.FileConfiguration;
 
 public class PluginConfig implements BaseConfig {
 
diff --git a/src/main/java/com/github/arthurfiorette/sinklibrary/config/addons/EnumConfig.java b/src/main/java/com/github/arthurfiorette/sinklibrary/config/addons/EnumConfig.java
index dd53cc8f..4f24da07 100644
--- a/src/main/java/com/github/arthurfiorette/sinklibrary/config/addons/EnumConfig.java
+++ b/src/main/java/com/github/arthurfiorette/sinklibrary/config/addons/EnumConfig.java
@@ -1,19 +1,17 @@
 package com.github.arthurfiorette.sinklibrary.config.addons;
 
+import com.github.arthurfiorette.sinklibrary.config.BaseConfig;
+import com.github.arthurfiorette.sinklibrary.replacer.Replacer;
+import com.github.arthurfiorette.sinklibrary.replacer.ReplacerFunction;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
-
 import org.bukkit.Color;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.configuration.*;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.util.Vector;
 
-import com.github.arthurfiorette.sinklibrary.config.BaseConfig;
-import com.github.arthurfiorette.sinklibrary.replacer.Replacer;
-import com.github.arthurfiorette.sinklibrary.replacer.ReplacerFunction;
-
 public interface EnumConfig<P extends Enum<P> & PathResolver> extends BaseConfig {
   /**
    * Checks if this {@link ConfigurationSection} contains the given path.
diff --git a/src/main/java/com/github/arthurfiorette/sinklibrary/config/management/ConfigStorage.java b/src/main/java/com/github/arthurfiorette/sinklibrary/config/management/ConfigStorage.java
index 928a42a5..b12d9423 100644
--- a/src/main/java/com/github/arthurfiorette/sinklibrary/config/management/ConfigStorage.java
+++ b/src/main/java/com/github/arthurfiorette/sinklibrary/config/management/ConfigStorage.java
@@ -1,11 +1,9 @@
 package com.github.arthurfiorette.sinklibrary.config.management;
 
-import java.util.EnumMap;
-
 import com.github.arthurfiorette.sinklibrary.config.BaseConfig;
 import com.github.arthurfiorette.sinklibrary.core.BasePlugin;
 import com.github.arthurfiorette.sinklibrary.interfaces.BaseComponent;
-
+import java.util.EnumMap;
 import lombok.Getter;
 
 public class ConfigStorage<L extends Enum<L> & ConfigLoader> implements BaseComponent {
diff --git a/src/main/java/com/github/arthurfiorette/sinklibrary/core/BasePlugin.java b/src/main/java/com/github/arthurfiorette/sinklibrary/core/BasePlugin.java
index bd4c16fd..b53253dd 100644
--- a/src/main/java/com/github/arthurfiorette/sinklibrary/core/BasePlugin.java
+++ b/src/main/java/com/github/arthurfiorette/sinklibrary/core/BasePlugin.java
@@ -1,14 +1,12 @@
 package com.github.arthurfiorette.sinklibrary.core;
 
-import java.util.concurrent.*;
-
-import org.bukkit.plugin.Plugin;
-
 import com.github.arthurfiorette.sinklibrary.components.ComponentManager;
 import com.github.arthurfiorette.sinklibrary.executor.v2.TaskContext;
 import com.github.arthurfiorette.sinklibrary.interfaces.BaseComponent;
 import com.github.arthurfiorette.sinklibrary.logging.BaseLogger;
 import com.github.arthurfiorette.sinklibrary.logging.Level;
+import java.util.concurrent.*;
+import org.bukkit.plugin.Plugin;
 
 public interface BasePlugin extends Plugin {
   void treatThrowable(Object author, Throwable throwable, String message, Object... args);
@@ -38,13 +36,21 @@ default <T extends BaseComponent> T getComponent(final Class<T> clazz) {
     return this.getManager().getComponent(clazz);
   }
 
-  default void log(final Level level, final Object author, final String message,
-      final Object... args) {
+  default void log(
+    final Level level,
+    final Object author,
+    final String message,
+    final Object... args
+  ) {
     this.getBaseLogger().log(level, author, message, args);
   }
 
-  default void log(final Level level, final Object author, final String message,
-      final Throwable throwable) {
+  default void log(
+    final Level level,
+    final Object author,
+    final String message,
+    final Throwable throwable
+  ) {
     this.getBaseLogger().log(level, author, message, throwable);
   }
 
@@ -55,5 +61,4 @@ default void log(final Level level, final String message, final Object... args)
   default void log(final Level level, final String message, final Throwable throwable) {
     this.getBaseLogger().log(level, message, throwable);
   }
-
 }
diff --git a/src/main/java/com/github/arthurfiorette/sinklibrary/core/SinkPlugin.java b/src/main/java/com/github/arthurfiorette/sinklibrary/core/SinkPlugin.java
index 8551f605..3b0c1edb 100644
--- a/src/main/java/com/github/arthurfiorette/sinklibrary/core/SinkPlugin.java
+++ b/src/main/java/com/github/arthurfiorette/sinklibrary/core/SinkPlugin.java
@@ -1,15 +1,13 @@
 package com.github.arthurfiorette.sinklibrary.core;
 
-import org.bukkit.plugin.java.JavaPlugin;
-
 import com.github.arthurfiorette.sinklibrary.components.ComponentManager;
 import com.github.arthurfiorette.sinklibrary.components.SimpleComponentManager;
 import com.github.arthurfiorette.sinklibrary.executor.v2.TaskContext;
 import com.github.arthurfiorette.sinklibrary.interfaces.BaseService;
 import com.github.arthurfiorette.sinklibrary.interfaces.ComponentLoader;
 import com.github.arthurfiorette.sinklibrary.logging.*;
-
 import lombok.*;
+import org.bukkit.plugin.java.JavaPlugin;
 
 @RequiredArgsConstructor
 public abstract class SinkPlugin extends JavaPlugin implements BasePlugin {
@@ -24,9 +22,8 @@ public abstract class SinkPlugin extends JavaPlugin implements BasePlugin {
 
   public SinkPlugin() {
     this.manager = new SimpleComponentManager(this);
-    this.baseLogger =
-      new BukkitLogger(this, Level.ALL);
-  } 
+    this.baseLogger = new BukkitLogger(this, Level.ALL);
+  }
 
   /**
    * @return the component array to register all of yours components and
diff --git a/src/main/java/com/github/arthurfiorette/sinklibrary/data/CacheOperator.java b/src/main/java/com/github/arthurfiorette/sinklibrary/data/CacheOperator.java
index 17ad93fc..2b878c93 100644
--- a/src/main/java/com/github/arthurfiorette/sinklibrary/data/CacheOperator.java
+++ b/src/main/java/com/github/arthurfiorette/sinklibrary/data/CacheOperator.java
@@ -1,8 +1,7 @@
 package com.github.arthurfiorette.sinklibrary.data;
 
-import java.util.function.Consumer;
-
 import com.google.common.cache.CacheBuilder;
+import java.util.function.Consumer;
 
 @FunctionalInterface
 public interface CacheOperator<K, V> extends Consumer<CacheBuilder<K, V>> {
diff --git a/src/main/java/com/github/arthurfiorette/sinklibrary/data/database/Database.java b/src/main/java/com/github/arthurfiorette/sinklibrary/data/database/Database.java
index f54f1065..be8b8da4 100644
--- a/src/main/java/com/github/arthurfiorette/sinklibrary/data/database/Database.java
+++ b/src/main/java/com/github/arthurfiorette/sinklibrary/data/database/Database.java
@@ -1,11 +1,9 @@
 package com.github.arthurfiorette.sinklibrary.data.database;
 
+import com.github.arthurfiorette.sinklibrary.interfaces.BaseService;
 import java.util.Collection;
-
 import javax.annotation.Nullable;
 
-import com.github.arthurfiorette.sinklibrary.interfaces.BaseService;
-
 /**
  * Represents a simple database model. <b>All of these methods are meant to be
  * executed in a synchronous way</b>
diff --git a/src/main/java/com/github/arthurfiorette/sinklibrary/data/database/MemoryDatabase.java b/src/main/java/com/github/arthurfiorette/sinklibrary/data/database/MemoryDatabase.java
index 24be9d03..e2ef89dc 100644
--- a/src/main/java/com/github/arthurfiorette/sinklibrary/data/database/MemoryDatabase.java
+++ b/src/main/java/com/github/arthurfiorette/sinklibrary/data/database/MemoryDatabase.java
@@ -1,11 +1,9 @@
 package com.github.arthurfiorette.sinklibrary.data.database;
 
+import com.github.arthurfiorette.sinklibrary.core.BasePlugin;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
-
-import com.github.arthurfiorette.sinklibrary.core.BasePlugin;
-
 import lombok.*;
 
 /**
diff --git a/src/main/java/com/github/arthurfiorette/sinklibrary/data/repository/AbstractRepository.java b/src/main/java/com/github/arthurfiorette/sinklibrary/data/repository/AbstractRepository.java
index c6acc2e5..526e8006 100644
--- a/src/main/java/com/github/arthurfiorette/sinklibrary/data/repository/AbstractRepository.java
+++ b/src/main/java/com/github/arthurfiorette/sinklibrary/data/repository/AbstractRepository.java
@@ -1,13 +1,11 @@
 package com.github.arthurfiorette.sinklibrary.data.repository;
 
-import java.util.Collection;
-import java.util.Set;
-import java.util.concurrent.CompletableFuture;
-
 import com.github.arthurfiorette.sinklibrary.core.BasePlugin;
 import com.github.arthurfiorette.sinklibrary.data.database.Database;
 import com.github.arthurfiorette.sinklibrary.interfaces.BaseComponent;
-
+import java.util.Collection;
+import java.util.Set;
+import java.util.concurrent.CompletableFuture;
 import lombok.*;
 
 @RequiredArgsConstructor
diff --git a/src/main/java/com/github/arthurfiorette/sinklibrary/data/repository/LoadingRepository.java b/src/main/java/com/github/arthurfiorette/sinklibrary/data/repository/LoadingRepository.java
index e2b3be69..b9a45e1e 100644
--- a/src/main/java/com/github/arthurfiorette/sinklibrary/data/repository/LoadingRepository.java
+++ b/src/main/java/com/github/arthurfiorette/sinklibrary/data/repository/LoadingRepository.java
@@ -1,9 +1,5 @@
 package com.github.arthurfiorette.sinklibrary.data.repository;
 
-import java.util.Collection;
-import java.util.Set;
-import java.util.concurrent.*;
-
 import com.github.arthurfiorette.sinklibrary.data.CacheOperator;
 import com.github.arthurfiorette.sinklibrary.data.LoadingWrapper;
 import com.github.arthurfiorette.sinklibrary.data.database.Database;
@@ -11,7 +7,9 @@
 import com.github.arthurfiorette.sinklibrary.interfaces.BaseService;
 import com.google.common.cache.*;
 import com.google.common.collect.Lists;
-
+import java.util.Collection;
+import java.util.Set;
+import java.util.concurrent.*;
 import lombok.Getter;
 import lombok.NonNull;
 
diff --git a/src/main/java/com/github/arthurfiorette/sinklibrary/data/repository/Repository.java b/src/main/java/com/github/arthurfiorette/sinklibrary/data/repository/Repository.java
index a19b3352..536595e0 100644
--- a/src/main/java/com/github/arthurfiorette/sinklibrary/data/repository/Repository.java
+++ b/src/main/java/com/github/arthurfiorette/sinklibrary/data/repository/Repository.java
@@ -1,12 +1,11 @@
 package com.github.arthurfiorette.sinklibrary.data.repository;
 
+import com.github.arthurfiorette.sinklibrary.data.database.Database;
+import com.github.arthurfiorette.sinklibrary.data.storage.Storage;
 import java.util.Collection;
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 
-import com.github.arthurfiorette.sinklibrary.data.database.Database;
-import com.github.arthurfiorette.sinklibrary.data.storage.Storage;
-
 /**
  * It's something between a {@link Storage} and a {@link Database}, but it has
  * its serialized and deserialized types the same.
diff --git a/src/main/java/com/github/arthurfiorette/sinklibrary/data/repository/addons/IdentifiableAdapter.java b/src/main/java/com/github/arthurfiorette/sinklibrary/data/repository/addons/IdentifiableAdapter.java
index f09bf911..9d542c27 100644
--- a/src/main/java/com/github/arthurfiorette/sinklibrary/data/repository/addons/IdentifiableAdapter.java
+++ b/src/main/java/com/github/arthurfiorette/sinklibrary/data/repository/addons/IdentifiableAdapter.java
@@ -1,10 +1,9 @@
 package com.github.arthurfiorette.sinklibrary.data.repository.addons;
 
-import java.util.UUID;
-import java.util.concurrent.CompletableFuture;
-
 import com.github.arthurfiorette.sinklibrary.data.repository.Repository;
 import com.github.arthurfiorette.sinklibrary.interfaces.Identifiable;
+import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
 
 public interface IdentifiableAdapter<V extends Identifiable, R> extends Repository<UUID, V> {
   default CompletableFuture<Void> save(final V value) {
diff --git a/src/main/java/com/github/arthurfiorette/sinklibrary/data/repository/addons/PlayerAdapter.java b/src/main/java/com/github/arthurfiorette/sinklibrary/data/repository/addons/PlayerAdapter.java
index c48c927d..753ab5b1 100644
--- a/src/main/java/com/github/arthurfiorette/sinklibrary/data/repository/addons/PlayerAdapter.java
+++ b/src/main/java/com/github/arthurfiorette/sinklibrary/data/repository/addons/PlayerAdapter.java
@@ -1,14 +1,12 @@
 package com.github.arthurfiorette.sinklibrary.data.repository.addons;
 
+import com.github.arthurfiorette.sinklibrary.data.repository.Repository;
 import java.util.Collection;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
-
 import org.bukkit.entity.Player;
 
-import com.github.arthurfiorette.sinklibrary.data.repository.Repository;
-
 public interface PlayerAdapter<V> extends Repository<UUID, V> {
   default CompletableFuture<V> get(final Player player) {
     return this.get(player.getUniqueId());
diff --git a/src/main/java/com/github/arthurfiorette/sinklibrary/data/storage/AbstractStorage.java b/src/main/java/com/github/arthurfiorette/sinklibrary/data/storage/AbstractStorage.java
index 3e8c7d33..f9b9f45b 100644
--- a/src/main/java/com/github/arthurfiorette/sinklibrary/data/storage/AbstractStorage.java
+++ b/src/main/java/com/github/arthurfiorette/sinklibrary/data/storage/AbstractStorage.java
@@ -1,15 +1,13 @@
 package com.github.arthurfiorette.sinklibrary.data.storage;
 
+import com.github.arthurfiorette.sinklibrary.core.BasePlugin;
+import com.github.arthurfiorette.sinklibrary.data.database.Database;
+import com.github.arthurfiorette.sinklibrary.interfaces.BaseComponent;
 import java.util.Collection;
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Function;
 import java.util.stream.Collectors;
-
-import com.github.arthurfiorette.sinklibrary.core.BasePlugin;
-import com.github.arthurfiorette.sinklibrary.data.database.Database;
-import com.github.arthurfiorette.sinklibrary.interfaces.BaseComponent;
-
 import lombok.*;
 
 @RequiredArgsConstructor
diff --git a/src/main/java/com/github/arthurfiorette/sinklibrary/data/storage/LoadingStorage.java b/src/main/java/com/github/arthurfiorette/sinklibrary/data/storage/LoadingStorage.java
index 03ff0673..425c01b0 100644
--- a/src/main/java/com/github/arthurfiorette/sinklibrary/data/storage/LoadingStorage.java
+++ b/src/main/java/com/github/arthurfiorette/sinklibrary/data/storage/LoadingStorage.java
@@ -1,18 +1,16 @@
 package com.github.arthurfiorette.sinklibrary.data.storage;
 
-import java.util.Collection;
-import java.util.Set;
-import java.util.concurrent.*;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
 import com.github.arthurfiorette.sinklibrary.data.CacheOperator;
 import com.github.arthurfiorette.sinklibrary.data.LoadingWrapper;
 import com.github.arthurfiorette.sinklibrary.data.database.Database;
 import com.github.arthurfiorette.sinklibrary.interfaces.BaseService;
 import com.google.common.cache.*;
 import com.google.common.collect.Lists;
-
+import java.util.Collection;
+import java.util.Set;
+import java.util.concurrent.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 import lombok.Getter;
 import lombok.NonNull;
 
diff --git a/src/main/java/com/github/arthurfiorette/sinklibrary/data/storage/Storage.java b/src/main/java/com/github/arthurfiorette/sinklibrary/data/storage/Storage.java
index e4a93eac..7a727d6f 100644
--- a/src/main/java/com/github/arthurfiorette/sinklibrary/data/storage/Storage.java
+++ b/src/main/java/com/github/arthurfiorette/sinklibrary/data/storage/Storage.java
@@ -1,12 +1,11 @@
 package com.github.arthurfiorette.sinklibrary.data.storage;
 
+import com.github.arthurfiorette.sinklibrary.data.database.Database;
 import java.util.Collection;
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Function;
 
-import com.github.arthurfiorette.sinklibrary.data.database.Database;
-
 /**
  * @param <K> Storage key type
  * @param <V> Storage value type
diff --git a/src/main/java/com/github/arthurfiorette/sinklibrary/data/storage/addons/IdentifiableAdapter.java b/src/main/java/com/github/arthurfiorette/sinklibrary/data/storage/addons/IdentifiableAdapter.java
index da85d353..c296d904 100644
--- a/src/main/java/com/github/arthurfiorette/sinklibrary/data/storage/addons/IdentifiableAdapter.java
+++ b/src/main/java/com/github/arthurfiorette/sinklibrary/data/storage/addons/IdentifiableAdapter.java
@@ -1,10 +1,9 @@
 package com.github.arthurfiorette.sinklibrary.data.storage.addons;
 
-import java.util.UUID;
-import java.util.concurrent.CompletableFuture;
-
 import com.github.arthurfiorette.sinklibrary.data.storage.Storage;
 import com.github.arthurfiorette.sinklibrary.interfaces.Identifiable;
+import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
 
 public interface IdentifiableAdapter<V extends Identifiable, R> extends Storage<UUID, V, R> {
   default CompletableFuture<Void> save(final V value) {
diff --git a/src/main/java/com/github/arthurfiorette/sinklibrary/data/storage/addons/PlayerAdapter.java b/src/main/java/com/github/arthurfiorette/sinklibrary/data/storage/addons/PlayerAdapter.java
index ec90a2b3..cec4d4f4 100644
--- a/src/main/java/com/github/arthurfiorette/sinklibrary/data/storage/addons/PlayerAdapter.java
+++ b/src/main/java/com/github/arthurfiorette/sinklibrary/data/storage/addons/PlayerAdapter.java
@@ -1,14 +1,12 @@
 package com.github.arthurfiorette.sinklibrary.data.storage.addons;
 
+import com.github.arthurfiorette.sinklibrary.data.storage.Storage;
 import java.util.Collection;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
-
 import org.bukkit.entity.Player;
 
-import com.github.arthurfiorette.sinklibrary.data.storage.Storage;
-
 public interface PlayerAdapter<V, R> extends Storage<UUID, V, R> {
   default CompletableFuture<V> get(final Player player) {
     return this.get(player.getUniqueId());
diff --git a/src/main/java/com/github/arthurfiorette/sinklibrary/data/storage/gson/GsonLoadingStorage.java b/src/main/java/com/github/arthurfiorette/sinklibrary/data/storage/gson/GsonLoadingStorage.java
index b976d493..d20adf5a 100644
--- a/src/main/java/com/github/arthurfiorette/sinklibrary/data/storage/gson/GsonLoadingStorage.java
+++ b/src/main/java/com/github/arthurfiorette/sinklibrary/data/storage/gson/GsonLoadingStorage.java
@@ -1,13 +1,11 @@
 package com.github.arthurfiorette.sinklibrary.data.storage.gson;
 
-import java.util.function.Function;
-
 import com.github.arthurfiorette.sinklibrary.core.BasePlugin;
 import com.github.arthurfiorette.sinklibrary.data.CacheOperator;
 import com.github.arthurfiorette.sinklibrary.data.database.Database;
 import com.github.arthurfiorette.sinklibrary.data.storage.LoadingStorage;
 import com.google.gson.*;
-
+import java.util.function.Function;
 import lombok.Getter;
 import lombok.NonNull;
 
diff --git a/src/main/java/com/github/arthurfiorette/sinklibrary/data/storage/gson/GsonStorage.java b/src/main/java/com/github/arthurfiorette/sinklibrary/data/storage/gson/GsonStorage.java
index 4f9fc5c1..0a0162f4 100644
--- a/src/main/java/com/github/arthurfiorette/sinklibrary/data/storage/gson/GsonStorage.java
+++ b/src/main/java/com/github/arthurfiorette/sinklibrary/data/storage/gson/GsonStorage.java
@@ -1,12 +1,10 @@
 package com.github.arthurfiorette.sinklibrary.data.storage.gson;
 
-import java.util.function.Function;
-
 import com.github.arthurfiorette.sinklibrary.core.BasePlugin;
 import com.github.arthurfiorette.sinklibrary.data.database.Database;
 import com.github.arthurfiorette.sinklibrary.data.storage.AbstractStorage;
 import com.google.gson.*;
-
+import java.util.function.Function;
 import lombok.*;
 
 public class GsonStorage<K, V> extends AbstractStorage<K, V, JsonObject> {
diff --git a/src/main/java/com/github/arthurfiorette/sinklibrary/exceptions/DisablingException.java b/src/main/java/com/github/arthurfiorette/sinklibrary/exceptions/DisablingException.java
index f54457dc..e50364ae 100644
--- a/src/main/java/com/github/arthurfiorette/sinklibrary/exceptions/DisablingException.java
+++ b/src/main/java/com/github/arthurfiorette/sinklibrary/exceptions/DisablingException.java
@@ -1,7 +1,6 @@
 package com.github.arthurfiorette.sinklibrary.exceptions;
 
 import com.github.arthurfiorette.sinklibrary.interfaces.BaseService;
-
 import lombok.NoArgsConstructor;
 
 /**
diff --git a/src/main/java/com/github/arthurfiorette/sinklibrary/exceptions/EnablingException.java b/src/main/java/com/github/arthurfiorette/sinklibrary/exceptions/EnablingException.java
index 9175b17d..c38637f1 100644
--- a/src/main/java/com/github/arthurfiorette/sinklibrary/exceptions/EnablingException.java
+++ b/src/main/java/com/github/arthurfiorette/sinklibrary/exceptions/EnablingException.java
@@ -1,7 +1,6 @@
 package com.github.arthurfiorette.sinklibrary.exceptions;
 
 import com.github.arthurfiorette.sinklibrary.interfaces.BaseService;
-
 import lombok.NoArgsConstructor;
 
 /**
diff --git a/src/main/java/com/github/arthurfiorette/sinklibrary/executor/BukkitExecutor.java b/src/main/java/com/github/arthurfiorette/sinklibrary/executor/BukkitExecutor.java
index 16f6f428..b9b05b96 100644
--- a/src/main/java/com/github/arthurfiorette/sinklibrary/executor/BukkitExecutor.java
+++ b/src/main/java/com/github/arthurfiorette/sinklibrary/executor/BukkitExecutor.java
@@ -1,12 +1,9 @@
 package com.github.arthurfiorette.sinklibrary.executor;
 
-import java.util.concurrent.*;
-
-import org.bukkit.scheduler.BukkitScheduler;
-
 import com.github.arthurfiorette.sinklibrary.core.BasePlugin;
-
+import java.util.concurrent.*;
 import lombok.experimental.UtilityClass;
+import org.bukkit.scheduler.BukkitScheduler;
 
 /**
  * Simple interface to target all executors that runs with a
diff --git a/src/main/java/com/github/arthurfiorette/sinklibrary/executor/BukkitThreadFactory.java b/src/main/java/com/github/arthurfiorette/sinklibrary/executor/BukkitThreadFactory.java
index f9285d05..7fd67993 100644
--- a/src/main/java/com/github/arthurfiorette/sinklibrary/executor/BukkitThreadFactory.java
+++ b/src/main/java/com/github/arthurfiorette/sinklibrary/executor/BukkitThreadFactory.java
@@ -1,10 +1,8 @@
 package com.github.arthurfiorette.sinklibrary.executor;
 
-import java.util.concurrent.ThreadFactory;
-
 import com.github.arthurfiorette.sinklibrary.core.BasePlugin;
 import com.github.arthurfiorette.sinklibrary.interfaces.BaseComponent;
-
+import java.util.concurrent.ThreadFactory;
 import lombok.*;
 
 /**
diff --git a/src/main/java/com/github/arthurfiorette/sinklibrary/executor/TaskContext.java b/src/main/java/com/github/arthurfiorette/sinklibrary/executor/TaskContext.java
index 9e4c17c6..bef2096e 100644
--- a/src/main/java/com/github/arthurfiorette/sinklibrary/executor/TaskContext.java
+++ b/src/main/java/com/github/arthurfiorette/sinklibrary/executor/TaskContext.java
@@ -1,12 +1,11 @@
 package com.github.arthurfiorette.sinklibrary.executor;
 
+import com.github.arthurfiorette.sinklibrary.core.BasePlugin;
 import org.bukkit.Bukkit;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.scheduler.BukkitScheduler;
 import org.bukkit.scheduler.BukkitTask;
 
-import com.github.arthurfiorette.sinklibrary.core.BasePlugin;
-
 /**
  * A helper enum to run schedule task with {@link BukkitScheduler}
  *
diff --git a/src/main/java/com/github/arthurfiorette/sinklibrary/executor/v2/TaskContext.java b/src/main/java/com/github/arthurfiorette/sinklibrary/executor/v2/TaskContext.java
index da515603..3210debc 100644
--- a/src/main/java/com/github/arthurfiorette/sinklibrary/executor/v2/TaskContext.java
+++ b/src/main/java/com/github/arthurfiorette/sinklibrary/executor/v2/TaskContext.java
@@ -1,11 +1,9 @@
 package com.github.arthurfiorette.sinklibrary.executor.v2;
 
+import com.github.arthurfiorette.sinklibrary.core.BasePlugin;
 import java.util.concurrent.*;
-
 import org.bukkit.Bukkit;
 
-import com.github.arthurfiorette.sinklibrary.core.BasePlugin;
-
 public enum TaskContext {
   /**
    * Represents the synchronous context of the bukkit.
diff --git a/src/main/java/com/github/arthurfiorette/sinklibrary/interfaces/Identifiable.java b/src/main/java/com/github/arthurfiorette/sinklibrary/interfaces/Identifiable.java
index 1345a0c5..448f010e 100644
--- a/src/main/java/com/github/arthurfiorette/sinklibrary/interfaces/Identifiable.java
+++ b/src/main/java/com/github/arthurfiorette/sinklibrary/interfaces/Identifiable.java
@@ -1,14 +1,12 @@
 package com.github.arthurfiorette.sinklibrary.interfaces;
 
+import com.github.arthurfiorette.sinklibrary.uuid.FastUuid;
 import java.util.Optional;
 import java.util.UUID;
-
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 
-import com.github.arthurfiorette.sinklibrary.uuid.FastUuid;
-
 /**
  * This class is used to help any objects that are with
  * {@link org.bukkit.entity.Player} or {@link java.util.UUID},related as Storing
diff --git a/src/main/java/com/github/arthurfiorette/sinklibrary/item/ItemBuilder.java b/src/main/java/com/github/arthurfiorette/sinklibrary/item/ItemBuilder.java
index 315ef065..01328728 100644
--- a/src/main/java/com/github/arthurfiorette/sinklibrary/item/ItemBuilder.java
+++ b/src/main/java/com/github/arthurfiorette/sinklibrary/item/ItemBuilder.java
@@ -1,9 +1,12 @@
 package com.github.arthurfiorette.sinklibrary.item;
 
+import com.github.arthurfiorette.sinklibrary.menu.item.BuilderStack;
+import com.github.arthurfiorette.sinklibrary.menu.listener.ClickListener;
+import com.github.arthurfiorette.sinklibrary.services.SpigotService;
 import java.util.*;
 import java.util.function.Consumer;
 import java.util.function.UnaryOperator;
-
+import lombok.*;
 import org.bukkit.Material;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.inventory.ItemFlag;
@@ -11,12 +14,6 @@
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.material.MaterialData;
 
-import com.github.arthurfiorette.sinklibrary.menu.item.BuilderStack;
-import com.github.arthurfiorette.sinklibrary.menu.listener.ClickListener;
-import com.github.arthurfiorette.sinklibrary.services.SpigotService;
-
-import lombok.*;
-
 /**
  * A builder class to customize in multiple ways a item stack.
  *
diff --git a/src/main/java/com/github/arthurfiorette/sinklibrary/item/ItemBuilders.java b/src/main/java/com/github/arthurfiorette/sinklibrary/item/ItemBuilders.java
index 3abee95f..75568469 100644
--- a/src/main/java/com/github/arthurfiorette/sinklibrary/item/ItemBuilders.java
+++ b/src/main/java/com/github/arthurfiorette/sinklibrary/item/ItemBuilders.java
@@ -1,16 +1,14 @@
 package com.github.arthurfiorette.sinklibrary.item;
 
+import com.mojang.authlib.GameProfile;
+import com.mojang.authlib.properties.Property;
 import java.lang.reflect.Field;
 import java.util.UUID;
-
 import org.apache.commons.codec.binary.Base64;
 import org.bukkit.Material;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.inventory.meta.SkullMeta;
 
-import com.mojang.authlib.GameProfile;
-import com.mojang.authlib.properties.Property;
-
 /**
  * A static class to help with item builder templates.
  *
diff --git a/src/main/java/com/github/arthurfiorette/sinklibrary/listener/SinkListener.java b/src/main/java/com/github/arthurfiorette/sinklibrary/listener/SinkListener.java
index d58c2eaf..4cab91bd 100644
--- a/src/main/java/com/github/arthurfiorette/sinklibrary/listener/SinkListener.java
+++ b/src/main/java/com/github/arthurfiorette/sinklibrary/listener/SinkListener.java
@@ -1,5 +1,8 @@
 package com.github.arthurfiorette.sinklibrary.listener;
 
+import com.github.arthurfiorette.sinklibrary.core.BasePlugin;
+import com.github.arthurfiorette.sinklibrary.interfaces.BaseService;
+import lombok.*;
 import org.bukkit.Bukkit;
 import org.bukkit.event.HandlerList;
 import org.bukkit.event.Listener;
@@ -14,11 +17,6 @@
 import org.bukkit.event.weather.*;
 import org.bukkit.event.world.*;
 
-import com.github.arthurfiorette.sinklibrary.core.BasePlugin;
-import com.github.arthurfiorette.sinklibrary.interfaces.BaseService;
-
-import lombok.*;
-
 /**
  * A abstract Spigot listener implementation with the most methods implements.
  * Override and use {@link org.bukkit.event.EventHandler} to make the method be
diff --git a/src/main/java/com/github/arthurfiorette/sinklibrary/logging/BaseLogger.java b/src/main/java/com/github/arthurfiorette/sinklibrary/logging/BaseLogger.java
index 106a8ba9..d98dd5fd 100644
--- a/src/main/java/com/github/arthurfiorette/sinklibrary/logging/BaseLogger.java
+++ b/src/main/java/com/github/arthurfiorette/sinklibrary/logging/BaseLogger.java
@@ -1,8 +1,7 @@
 package com.github.arthurfiorette.sinklibrary.logging;
 
-import java.util.Collection;
-
 import com.github.arthurfiorette.sinklibrary.interfaces.BaseComponent;
+import java.util.Collection;
 
 public interface BaseLogger extends BaseComponent {
   void log(Level level, Object author, String message, Object... args);
diff --git a/src/main/java/com/github/arthurfiorette/sinklibrary/logging/BukkitLogger.java b/src/main/java/com/github/arthurfiorette/sinklibrary/logging/BukkitLogger.java
index 95316d1e..da0d20eb 100644
--- a/src/main/java/com/github/arthurfiorette/sinklibrary/logging/BukkitLogger.java
+++ b/src/main/java/com/github/arthurfiorette/sinklibrary/logging/BukkitLogger.java
@@ -1,14 +1,11 @@
 package com.github.arthurfiorette.sinklibrary.logging;
 
+import com.github.arthurfiorette.sinklibrary.core.BasePlugin;
 import java.util.ArrayList;
-
+import lombok.*;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 
-import com.github.arthurfiorette.sinklibrary.core.BasePlugin;
-
-import lombok.*;
-
 @RequiredArgsConstructor
 public class BukkitLogger implements BaseLogger {
 
diff --git a/src/main/java/com/github/arthurfiorette/sinklibrary/logging/Level.java b/src/main/java/com/github/arthurfiorette/sinklibrary/logging/Level.java
index a8969cb1..fac9a906 100644
--- a/src/main/java/com/github/arthurfiorette/sinklibrary/logging/Level.java
+++ b/src/main/java/com/github/arthurfiorette/sinklibrary/logging/Level.java
@@ -1,8 +1,7 @@
 package com.github.arthurfiorette.sinklibrary.logging;
 
-import org.bukkit.ChatColor;
-
 import lombok.*;
+import org.bukkit.ChatColor;
 
 /**
  * Modified to support Bukkit chat colors and more.
diff --git a/src/main/java/com/github/arthurfiorette/sinklibrary/menu/BaseMenu.java b/src/main/java/com/github/arthurfiorette/sinklibrary/menu/BaseMenu.java
index 9098df04..18059ae9 100644
--- a/src/main/java/com/github/arthurfiorette/sinklibrary/menu/BaseMenu.java
+++ b/src/main/java/com/github/arthurfiorette/sinklibrary/menu/BaseMenu.java
@@ -1,9 +1,8 @@
 package com.github.arthurfiorette.sinklibrary.menu;
 
-import org.bukkit.inventory.InventoryHolder;
-
 import com.github.arthurfiorette.sinklibrary.interfaces.BaseComponent;
 import com.github.arthurfiorette.sinklibrary.menu.item.MenuItem;
+import org.bukkit.inventory.InventoryHolder;
 
 public interface BaseMenu extends BaseComponent, InventoryHolder {
   void update();
diff --git a/src/main/java/com/github/arthurfiorette/sinklibrary/menu/PageableMenu.java b/src/main/java/com/github/arthurfiorette/sinklibrary/menu/PageableMenu.java
index d8ff59e4..8e3c9025 100644
--- a/src/main/java/com/github/arthurfiorette/sinklibrary/menu/PageableMenu.java
+++ b/src/main/java/com/github/arthurfiorette/sinklibrary/menu/PageableMenu.java
@@ -1,17 +1,14 @@
 package com.github.arthurfiorette.sinklibrary.menu;
 
+import com.github.arthurfiorette.sinklibrary.core.BasePlugin;
+import com.github.arthurfiorette.sinklibrary.menu.item.MenuItem;
 import java.util.ArrayList;
 import java.util.List;
-
+import lombok.Getter;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
 
-import com.github.arthurfiorette.sinklibrary.core.BasePlugin;
-import com.github.arthurfiorette.sinklibrary.menu.item.MenuItem;
-
-import lombok.Getter;
-
 public abstract class PageableMenu extends PrivateMenu {
 
   @Getter
diff --git a/src/main/java/com/github/arthurfiorette/sinklibrary/menu/PrivateMenu.java b/src/main/java/com/github/arthurfiorette/sinklibrary/menu/PrivateMenu.java
index 6e8cefbb..33b9489a 100644
--- a/src/main/java/com/github/arthurfiorette/sinklibrary/menu/PrivateMenu.java
+++ b/src/main/java/com/github/arthurfiorette/sinklibrary/menu/PrivateMenu.java
@@ -1,11 +1,9 @@
 package com.github.arthurfiorette.sinklibrary.menu;
 
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.Inventory;
-
 import com.github.arthurfiorette.sinklibrary.core.BasePlugin;
-
 import lombok.Getter;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.Inventory;
 
 public abstract class PrivateMenu extends StaticMenu {
 
diff --git a/src/main/java/com/github/arthurfiorette/sinklibrary/menu/StaticMenu.java b/src/main/java/com/github/arthurfiorette/sinklibrary/menu/StaticMenu.java
index a283e637..db99a800 100644
--- a/src/main/java/com/github/arthurfiorette/sinklibrary/menu/StaticMenu.java
+++ b/src/main/java/com/github/arthurfiorette/sinklibrary/menu/StaticMenu.java
@@ -1,19 +1,16 @@
 package com.github.arthurfiorette.sinklibrary.menu;
 
+import com.github.arthurfiorette.sinklibrary.core.BasePlugin;
+import com.github.arthurfiorette.sinklibrary.menu.item.MenuItem;
 import java.util.Map;
-
+import lombok.Getter;
+import lombok.Setter;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
 
-import com.github.arthurfiorette.sinklibrary.core.BasePlugin;
-import com.github.arthurfiorette.sinklibrary.menu.item.MenuItem;
-
-import lombok.Getter;
-import lombok.Setter;
-
 public abstract class StaticMenu implements BaseMenu {
 
   @Getter
diff --git a/src/main/java/com/github/arthurfiorette/sinklibrary/menu/item/BuilderStack.java b/src/main/java/com/github/arthurfiorette/sinklibrary/menu/item/BuilderStack.java
index e9162205..55915144 100644
--- a/src/main/java/com/github/arthurfiorette/sinklibrary/menu/item/BuilderStack.java
+++ b/src/main/java/com/github/arthurfiorette/sinklibrary/menu/item/BuilderStack.java
@@ -1,12 +1,10 @@
 package com.github.arthurfiorette.sinklibrary.menu.item;
 
-import org.bukkit.inventory.ItemStack;
-
 import com.github.arthurfiorette.sinklibrary.item.ItemBuilder;
 import com.github.arthurfiorette.sinklibrary.menu.BaseMenu;
 import com.github.arthurfiorette.sinklibrary.menu.listener.ClickListener;
-
 import lombok.*;
+import org.bukkit.inventory.ItemStack;
 
 @RequiredArgsConstructor
 public class BuilderStack implements MenuItem {
diff --git a/src/main/java/com/github/arthurfiorette/sinklibrary/menu/item/MenuItem.java b/src/main/java/com/github/arthurfiorette/sinklibrary/menu/item/MenuItem.java
index 0bda9958..8c900743 100644
--- a/src/main/java/com/github/arthurfiorette/sinklibrary/menu/item/MenuItem.java
+++ b/src/main/java/com/github/arthurfiorette/sinklibrary/menu/item/MenuItem.java
@@ -1,8 +1,7 @@
 package com.github.arthurfiorette.sinklibrary.menu.item;
 
-import org.bukkit.inventory.ItemStack;
-
 import com.github.arthurfiorette.sinklibrary.menu.listener.ClickListener;
+import org.bukkit.inventory.ItemStack;
 
 public interface MenuItem {
   ItemStack getItem();
diff --git a/src/main/java/com/github/arthurfiorette/sinklibrary/menu/item/MenuStack.java b/src/main/java/com/github/arthurfiorette/sinklibrary/menu/item/MenuStack.java
index e1bcd4a7..e78967b7 100644
--- a/src/main/java/com/github/arthurfiorette/sinklibrary/menu/item/MenuStack.java
+++ b/src/main/java/com/github/arthurfiorette/sinklibrary/menu/item/MenuStack.java
@@ -1,11 +1,9 @@
 package com.github.arthurfiorette.sinklibrary.menu.item;
 
-import org.bukkit.inventory.ItemStack;
-
 import com.github.arthurfiorette.sinklibrary.menu.BaseMenu;
 import com.github.arthurfiorette.sinklibrary.menu.listener.ClickListener;
-
 import lombok.*;
+import org.bukkit.inventory.ItemStack;
 
 @RequiredArgsConstructor
 public class MenuStack implements MenuItem {
diff --git a/src/main/java/com/github/arthurfiorette/sinklibrary/menu/management/MenuFactory.java b/src/main/java/com/github/arthurfiorette/sinklibrary/menu/management/MenuFactory.java
index 0f04a27f..180d56be 100644
--- a/src/main/java/com/github/arthurfiorette/sinklibrary/menu/management/MenuFactory.java
+++ b/src/main/java/com/github/arthurfiorette/sinklibrary/menu/management/MenuFactory.java
@@ -1,9 +1,8 @@
 package com.github.arthurfiorette.sinklibrary.menu.management;
 
-import org.bukkit.entity.Player;
-
 import com.github.arthurfiorette.sinklibrary.core.BasePlugin;
 import com.github.arthurfiorette.sinklibrary.menu.BaseMenu;
+import org.bukkit.entity.Player;
 
 /**
  * Simple interface to target all classes that can create an SinkMenu.
diff --git a/src/main/java/com/github/arthurfiorette/sinklibrary/menu/management/MenuListener.java b/src/main/java/com/github/arthurfiorette/sinklibrary/menu/management/MenuListener.java
index 6f89321d..66fddf37 100644
--- a/src/main/java/com/github/arthurfiorette/sinklibrary/menu/management/MenuListener.java
+++ b/src/main/java/com/github/arthurfiorette/sinklibrary/menu/management/MenuListener.java
@@ -1,16 +1,15 @@
 package com.github.arthurfiorette.sinklibrary.menu.management;
 
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.inventory.InventoryAction;
-import org.bukkit.event.inventory.InventoryClickEvent;
-import org.bukkit.inventory.Inventory;
-
 import com.github.arthurfiorette.sinklibrary.core.BasePlugin;
 import com.github.arthurfiorette.sinklibrary.listener.SinkListener;
 import com.github.arthurfiorette.sinklibrary.menu.BaseMenu;
 import com.github.arthurfiorette.sinklibrary.menu.item.MenuItem;
 import com.github.arthurfiorette.sinklibrary.menu.listener.ClickListener;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.inventory.InventoryAction;
+import org.bukkit.event.inventory.InventoryClickEvent;
+import org.bukkit.inventory.Inventory;
 
 public final class MenuListener extends SinkListener {
 
diff --git a/src/main/java/com/github/arthurfiorette/sinklibrary/menu/management/MenuStorage.java b/src/main/java/com/github/arthurfiorette/sinklibrary/menu/management/MenuStorage.java
index ba0c5166..9a7f95ab 100644
--- a/src/main/java/com/github/arthurfiorette/sinklibrary/menu/management/MenuStorage.java
+++ b/src/main/java/com/github/arthurfiorette/sinklibrary/menu/management/MenuStorage.java
@@ -1,16 +1,13 @@
 package com.github.arthurfiorette.sinklibrary.menu.management;
 
-import java.util.*;
-
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.Inventory;
-
 import com.github.arthurfiorette.sinklibrary.core.BasePlugin;
 import com.github.arthurfiorette.sinklibrary.interfaces.BaseService;
 import com.github.arthurfiorette.sinklibrary.menu.BaseMenu;
-
+import java.util.*;
 import lombok.Getter;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.Inventory;
 
 public abstract class MenuStorage<M extends Enum<M> & MenuFactory> implements BaseService {
 
diff --git a/src/main/java/com/github/arthurfiorette/sinklibrary/replacer/Replacer.java b/src/main/java/com/github/arthurfiorette/sinklibrary/replacer/Replacer.java
index e1f9f855..91ddb293 100644
--- a/src/main/java/com/github/arthurfiorette/sinklibrary/replacer/Replacer.java
+++ b/src/main/java/com/github/arthurfiorette/sinklibrary/replacer/Replacer.java
@@ -1,15 +1,12 @@
 package com.github.arthurfiorette.sinklibrary.replacer;
 
+import com.github.arthurfiorette.sinklibrary.services.SpigotService;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.function.Supplier;
-
-import org.bukkit.OfflinePlayer;
-
-import com.github.arthurfiorette.sinklibrary.services.SpigotService;
-
 import me.clip.placeholderapi.PlaceholderAPI;
+import org.bukkit.OfflinePlayer;
 
 /**
  * A better text replacer that supports PlaceholderAPI (if enabled)
diff --git a/src/main/java/com/github/arthurfiorette/sinklibrary/services/JavaService.java b/src/main/java/com/github/arthurfiorette/sinklibrary/services/JavaService.java
index 1ae58ff6..fcced6f6 100644
--- a/src/main/java/com/github/arthurfiorette/sinklibrary/services/JavaService.java
+++ b/src/main/java/com/github/arthurfiorette/sinklibrary/services/JavaService.java
@@ -1,11 +1,9 @@
 package com.github.arthurfiorette.sinklibrary.services;
 
+import com.google.common.collect.ObjectArrays;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
-
-import com.google.common.collect.ObjectArrays;
-
 import lombok.experimental.UtilityClass;
 
 /**
diff --git a/src/main/java/com/github/arthurfiorette/sinklibrary/services/SpigotService.java b/src/main/java/com/github/arthurfiorette/sinklibrary/services/SpigotService.java
index 24f4280c..aabc8506 100644
--- a/src/main/java/com/github/arthurfiorette/sinklibrary/services/SpigotService.java
+++ b/src/main/java/com/github/arthurfiorette/sinklibrary/services/SpigotService.java
@@ -5,15 +5,13 @@
 import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
 import java.util.logging.Level;
-
+import lombok.experimental.UtilityClass;
 import org.bukkit.*;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 
-import lombok.experimental.UtilityClass;
-
 /**
  * A service class that handles with spigot.
  *
diff --git a/src/main/java/com/github/arthurfiorette/sinklibrary/services/TextService.java b/src/main/java/com/github/arthurfiorette/sinklibrary/services/TextService.java
index 7137ca99..f73973c7 100644
--- a/src/main/java/com/github/arthurfiorette/sinklibrary/services/TextService.java
+++ b/src/main/java/com/github/arthurfiorette/sinklibrary/services/TextService.java
@@ -2,12 +2,10 @@
 
 import java.util.*;
 import java.util.regex.Pattern;
-
+import lombok.experimental.UtilityClass;
 import org.apache.commons.lang.WordUtils;
 import org.bukkit.ChatColor;
 
-import lombok.experimental.UtilityClass;
-
 /**
  * A service class that handles with texts.
  *
diff --git a/src/main/java/com/github/arthurfiorette/sinklibrary/services/YmlService.java b/src/main/java/com/github/arthurfiorette/sinklibrary/services/YmlService.java
index aff203fd..8c82ad4b 100644
--- a/src/main/java/com/github/arthurfiorette/sinklibrary/services/YmlService.java
+++ b/src/main/java/com/github/arthurfiorette/sinklibrary/services/YmlService.java
@@ -1,14 +1,11 @@
 package com.github.arthurfiorette.sinklibrary.services;
 
+import com.google.common.collect.Maps;
 import java.util.*;
-
+import lombok.experimental.UtilityClass;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.file.FileConfiguration;
 
-import com.google.common.collect.Maps;
-
-import lombok.experimental.UtilityClass;
-
 /**
  * A service class that handles with yml.
  *
diff --git a/src/main/java/com/github/arthurfiorette/sinklibrary/tuple/Pair.java b/src/main/java/com/github/arthurfiorette/sinklibrary/tuple/Pair.java
index 5b397f61..d1c80e28 100644
--- a/src/main/java/com/github/arthurfiorette/sinklibrary/tuple/Pair.java
+++ b/src/main/java/com/github/arthurfiorette/sinklibrary/tuple/Pair.java
@@ -1,7 +1,6 @@
 package com.github.arthurfiorette.sinklibrary.tuple;
 
 import java.io.Serializable;
-
 import lombok.*;
 
 @Getter
diff --git a/src/main/java/com/github/arthurfiorette/sinklibrary/uuid/FastUuid.java b/src/main/java/com/github/arthurfiorette/sinklibrary/uuid/FastUuid.java
index f594bd8e..18e50d8a 100644
--- a/src/main/java/com/github/arthurfiorette/sinklibrary/uuid/FastUuid.java
+++ b/src/main/java/com/github/arthurfiorette/sinklibrary/uuid/FastUuid.java
@@ -2,7 +2,6 @@
 
 import java.util.Arrays;
 import java.util.UUID;
-
 import lombok.NonNull;
 import lombok.experimental.UtilityClass;
 
diff --git a/src/main/java/com/github/arthurfiorette/sinklibrary/uuid/MojangIdAdapter.java b/src/main/java/com/github/arthurfiorette/sinklibrary/uuid/MojangIdAdapter.java
index 60a56ed8..eb4f4446 100644
--- a/src/main/java/com/github/arthurfiorette/sinklibrary/uuid/MojangIdAdapter.java
+++ b/src/main/java/com/github/arthurfiorette/sinklibrary/uuid/MojangIdAdapter.java
@@ -1,11 +1,10 @@
 package com.github.arthurfiorette.sinklibrary.uuid;
 
-import java.io.IOException;
-import java.util.UUID;
-
 import com.google.gson.TypeAdapter;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
+import java.io.IOException;
+import java.util.UUID;
 
 /**
  * A simple {@link UUID} {@link TypeAdapter} that uses {@link FastUuid} to write
diff --git a/src/main/java/com/github/arthurfiorette/sinklibrary/uuid/MojangIdSerializer.java b/src/main/java/com/github/arthurfiorette/sinklibrary/uuid/MojangIdSerializer.java
index 859bb9ba..b3a9f7de 100644
--- a/src/main/java/com/github/arthurfiorette/sinklibrary/uuid/MojangIdSerializer.java
+++ b/src/main/java/com/github/arthurfiorette/sinklibrary/uuid/MojangIdSerializer.java
@@ -1,10 +1,9 @@
 package com.github.arthurfiorette.sinklibrary.uuid;
 
+import com.google.gson.*;
 import java.lang.reflect.Type;
 import java.util.UUID;
 
-import com.google.gson.*;
-
 public class MojangIdSerializer implements JsonDeserializer<UUID>, JsonSerializer<UUID> {
 
   @Override
diff --git a/src/main/java/com/github/arthurfiorette/sinklibrary/uuid/UuidAdapter.java b/src/main/java/com/github/arthurfiorette/sinklibrary/uuid/UuidAdapter.java
index 24d5e61f..fe751a42 100644
--- a/src/main/java/com/github/arthurfiorette/sinklibrary/uuid/UuidAdapter.java
+++ b/src/main/java/com/github/arthurfiorette/sinklibrary/uuid/UuidAdapter.java
@@ -1,11 +1,10 @@
 package com.github.arthurfiorette.sinklibrary.uuid;
 
-import java.io.IOException;
-import java.util.UUID;
-
 import com.google.gson.TypeAdapter;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
+import java.io.IOException;
+import java.util.UUID;
 
 /**
  * A simple {@link UUID} {@link TypeAdapter} that uses {@link FastUuid} to write
diff --git a/src/main/java/com/github/arthurfiorette/sinklibrary/uuid/UuidSerializer.java b/src/main/java/com/github/arthurfiorette/sinklibrary/uuid/UuidSerializer.java
index 974949a0..b30d92d0 100644
--- a/src/main/java/com/github/arthurfiorette/sinklibrary/uuid/UuidSerializer.java
+++ b/src/main/java/com/github/arthurfiorette/sinklibrary/uuid/UuidSerializer.java
@@ -1,10 +1,9 @@
 package com.github.arthurfiorette.sinklibrary.uuid;
 
+import com.google.gson.*;
 import java.lang.reflect.Type;
 import java.util.UUID;
 
-import com.google.gson.*;
-
 public class UuidSerializer implements JsonDeserializer<UUID>, JsonSerializer<UUID> {
 
   @Override