diff --git a/pom.xml b/pom.xml
index 8c6c159..42c7885 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,10 +18,6 @@
             <id>papermc</id>
             <url>https://repo.papermc.io/repository/maven-public/</url>
         </repository>
-        <repository>
-            <id>spigot-repo</id>
-            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
-        </repository>
         <repository>
             <id>placeholderapi</id>
             <url>https://repo.extendedclip.com/content/repositories/placeholderapi/</url>
@@ -35,12 +31,6 @@
             <version>1.21.11-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.spigotmc</groupId>
-            <artifactId>spigot-api</artifactId>
-            <version>1.21.11-R0.1-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>me.clip</groupId>
             <artifactId>placeholderapi</artifactId>
diff --git a/src/main/java/svar/ajneb97/ServerVariables.java b/src/main/java/svar/ajneb97/ServerVariables.java
index d705a01..e328eba 100644
--- a/src/main/java/svar/ajneb97/ServerVariables.java
+++ b/src/main/java/svar/ajneb97/ServerVariables.java
@@ -1,6 +1,7 @@
 package svar.ajneb97;
 
 import org.bukkit.Bukkit;
+import org.bukkit.command.PluginCommand;
 import org.bukkit.plugin.PluginDescriptionFile;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
@@ -16,12 +17,12 @@
 import svar.ajneb97.tasks.DataSaveTask;
 import svar.ajneb97.utils.ServerVersion;
 
-
+@SuppressWarnings("deprecation")
 public class ServerVariables extends JavaPlugin {
 
     public static String prefix;
     public static ServerVersion serverVersion;
-    private PluginDescriptionFile pdfFile = getDescription();
+    private final PluginDescriptionFile pdfFile = getDescription();
     public String version = pdfFile.getVersion();
 
     private VariablesManager variablesManager;
@@ -35,51 +36,63 @@ public class ServerVariables extends JavaPlugin {
 
     private MySQLConnection mySQLConnection;
 
-    public void onEnable(){
+    public final boolean isFolia = checkFolia();
+
+    public void onEnable() {
         setVersion();
         setPrefix();
 
-        this.variablesManager = new VariablesManager(this);
-        this.serverVariablesManager = new ServerVariablesManager(this);
-        this.playerVariablesManager = new PlayerVariablesManager(this);
+        variablesManager = new VariablesManager(this);
+        serverVariablesManager = new ServerVariablesManager();
+        playerVariablesManager = new PlayerVariablesManager(this);
+
         registerCommands();
         registerEvents();
 
-        this.configsManager = new ConfigsManager(this);
-        this.configsManager.configure();
+        configsManager = new ConfigsManager(this);
+        configsManager.configure();
 
-        ServerVariablesAPI api = new ServerVariablesAPI(this);
-        if(Bukkit.getServer().getPluginManager().getPlugin("PlaceholderAPI") != null){
+        if (Bukkit.getServer().getPluginManager().getPlugin("PlaceholderAPI") != null) {
             new ServerVariablesExpansion(this).register();
         }
-        Metrics metrics = new Metrics(this,19731);
+        new Metrics(this, 19731);
 
-        if(configsManager.getMainConfigManager().isMySQL()){
+        if (configsManager.getMainConfigManager().isMySQL()) {
             mySQLConnection = new MySQLConnection(this);
             mySQLConnection.setupMySql();
         }
 
-        Bukkit.getConsoleSender().sendMessage(MessagesManager.getLegacyColoredMessage(prefix+" &eHas been enabled! &fVersion: "+version));
-        Bukkit.getConsoleSender().sendMessage(MessagesManager.getLegacyColoredMessage(prefix+" &eThanks for using my plugin!   &f~Ajneb97"));
+        dataSaveTask = new DataSaveTask(this);
+        dataSaveTask.start(configsManager.getMainConfigManager().getConfig().getInt("config.data_save_time"));
+
+        Bukkit.getConsoleSender().sendMessage(MessagesManager.getLegacyColoredMessage(prefix + " &eHas been enabled! &fVersion: " + version));
+        Bukkit.getConsoleSender().sendMessage(MessagesManager.getLegacyColoredMessage(prefix + " &eThanks for using my plugin!   &f~Ajneb97"));
 
         updateCheckerManager = new UpdateCheckerManager(version);
         updateMessage(updateCheckerManager.check());
+        ServerVariablesAPI.init(this);
     }
 
-    public void onDisable(){
-        this.configsManager.saveServerData();
-        this.configsManager.savePlayerData();
-        Bukkit.getConsoleSender().sendMessage(MessagesManager.getLegacyColoredMessage(prefix+" &eHas been disabled! &fVersion: "+version));
+    public void onDisable() {
+        configsManager.saveServerData();
+
+        configsManager.savePlayerData();
+
+        if (mySQLConnection != null) {
+            mySQLConnection.disable();
+        }
+
+        Bukkit.getConsoleSender().sendMessage(MessagesManager.getLegacyColoredMessage(prefix + " &eHas been disabled! &fVersion: " + version));
     }
 
-    public void setPrefix(){
+    public void setPrefix() {
         prefix = MessagesManager.getLegacyColoredMessage("&8[&a&lServerVariables&8]");
     }
 
-    public void setVersion(){
+    public void setVersion() {
         String packageName = Bukkit.getServer().getClass().getPackage().getName();
         String bukkitVersion = Bukkit.getServer().getBukkitVersion().split("-")[0];
-        switch(bukkitVersion){
+        switch (bukkitVersion) {
             case "1.20.5":
             case "1.20.6":
                 serverVersion = ServerVersion.v1_20_R4;
@@ -111,9 +124,9 @@ public void setVersion(){
                 serverVersion = ServerVersion.v1_21_R7;
                 break;
             default:
-                try{
+                try {
                     serverVersion = ServerVersion.valueOf(packageName.replace("org.bukkit.craftbukkit.", ""));
-                }catch(Exception e){
+                } catch (Exception e) {
                     serverVersion = ServerVersion.v1_21_R7;
                 }
         }
@@ -142,6 +155,7 @@ public ConfigsManager getConfigsManager() {
     public PlayerVariablesManager getPlayerVariablesManager() {
         return playerVariablesManager;
     }
+
     public void registerEvents() {
         PluginManager pm = getServer().getPluginManager();
         pm.registerEvents(new PlayerListener(this), this);
@@ -151,31 +165,39 @@ public DataSaveTask getDataSaveTask() {
         return dataSaveTask;
     }
 
-    public void setDataSaveTask(DataSaveTask dataSaveTask) {
-        this.dataSaveTask = dataSaveTask;
-    }
     public UpdateCheckerManager getUpdateCheckerManager() {
         return updateCheckerManager;
     }
 
-    public void registerCommands(){
-        this.getCommand("servervariables").setExecutor(new MainCommand(this));
+    public void registerCommands() {
+        PluginCommand command = getCommand("servervariables");
+        if (command != null) {
+            command.setExecutor(new MainCommand(this));
+        }
     }
 
     public MySQLConnection getMySQLConnection() {
         return mySQLConnection;
     }
 
-    public void updateMessage(UpdateCheckerResult result){
-        if(!result.isError()){
+    public void updateMessage(UpdateCheckerResult result) {
+        if (!result.isError()) {
             String latestVersion = result.getLatestVersion();
-            if(latestVersion != null){
-                Bukkit.getConsoleSender().sendMessage(MessagesManager.getLegacyColoredMessage("&cThere is a new version available. &e(&7"+latestVersion+"&e)"));
+            if (latestVersion != null) {
+                Bukkit.getConsoleSender().sendMessage(MessagesManager.getLegacyColoredMessage("&cThere is a new version available. &e(&7" + latestVersion + "&e)"));
                 Bukkit.getConsoleSender().sendMessage(MessagesManager.getLegacyColoredMessage("&cYou can download it at: &fhttps://modrinth.com/plugin/servervariables"));
             }
-        }else{
-            Bukkit.getConsoleSender().sendMessage(MessagesManager.getLegacyColoredMessage(prefix+" &cError while checking update."));
+        } else {
+            Bukkit.getConsoleSender().sendMessage(MessagesManager.getLegacyColoredMessage(prefix + " &cError while checking update."));
         }
+    }
 
+    private boolean checkFolia() {
+        try {
+            Class.forName("io.papermc.paper.threadedregions.RegionizedServer");
+            return true;
+        } catch (ClassNotFoundException e) {
+            return false;
+        }
     }
 }
diff --git a/src/main/java/svar/ajneb97/api/ListVariableChangeEvent.java b/src/main/java/svar/ajneb97/api/ListVariableChangeEvent.java
index 367c76e..4067d35 100644
--- a/src/main/java/svar/ajneb97/api/ListVariableChangeEvent.java
+++ b/src/main/java/svar/ajneb97/api/ListVariableChangeEvent.java
@@ -5,10 +5,12 @@
 
 import java.util.List;
 
+@SuppressWarnings("unused")
 public class ListVariableChangeEvent extends VariableChangeEvent {
-    private List<String> newValue;
-    private List<String> oldValue;
-    private int indexModified;
+
+    private final List<String> newValue;
+    private final List<String> oldValue;
+    private final int indexModified;
 
     public ListVariableChangeEvent(Player player, Variable variable, List<String> newValue, List<String> oldValue, int indexModified) {
         super(player, variable);
diff --git a/src/main/java/svar/ajneb97/api/ServerVariablesAPI.java b/src/main/java/svar/ajneb97/api/ServerVariablesAPI.java
index 7331538..5731bb3 100644
--- a/src/main/java/svar/ajneb97/api/ServerVariablesAPI.java
+++ b/src/main/java/svar/ajneb97/api/ServerVariablesAPI.java
@@ -10,152 +10,154 @@
 import java.util.List;
 import java.util.UUID;
 
+@SuppressWarnings("unused")
 public class ServerVariablesAPI {
 
     private static ServerVariables plugin;
-    public ServerVariablesAPI(ServerVariables plugin) {
-        this.plugin = plugin;
+
+    public static void init(ServerVariables plugin) {
+        ServerVariablesAPI.plugin = plugin;
     }
 
-    public static StringVariableResult getVariableValue(UUID uuid, String variableName){
+    public static StringVariableResult getVariableValue(UUID uuid, String variableName) {
         return plugin.getPlayerVariablesManager().getVariableValue(uuid, variableName, false);
     }
 
-    public static StringVariableResult getVariableValue(String playerName, String variableName){
+    public static StringVariableResult getVariableValue(String playerName, String variableName) {
         return plugin.getPlayerVariablesManager().getVariableValue(playerName, variableName, false);
     }
 
-    public static StringVariableResult getVariableValue(String variableName){
+    public static StringVariableResult getVariableValue(String variableName) {
         return plugin.getVariablesManager().getVariableValue(null, variableName, false);
     }
 
-    public static String getVariableDisplay(String playerName, String variableName){
-        StringVariableResult result = plugin.getVariablesManager().getVariableValue(playerName,variableName,false);
-        if(result.getVariable() != null){
-            return plugin.getVariablesManager().getDisplayFromVariableValue(result.getVariable(),result.getResultValue());
+    public static String getVariableDisplay(String playerName, String variableName) {
+        StringVariableResult result = plugin.getVariablesManager().getVariableValue(playerName, variableName, false);
+        if (result.getVariable() != null) {
+            return plugin.getVariablesManager().getDisplayFromVariableValue(result.getVariable(), result.getResultValue());
         }
         return result.getResultValue();
     }
 
-    public static String getVariableDisplay(String variableName){
-        StringVariableResult result = plugin.getVariablesManager().getVariableValue(null,variableName,false);
-        if(result.getVariable() != null){
-            return plugin.getVariablesManager().getDisplayFromVariableValue(result.getVariable(),result.getResultValue());
+    public static String getVariableDisplay(String variableName) {
+        StringVariableResult result = plugin.getVariablesManager().getVariableValue(null, variableName, false);
+        if (result.getVariable() != null) {
+            return plugin.getVariablesManager().getDisplayFromVariableValue(result.getVariable(), result.getResultValue());
         }
         return result.getResultValue();
     }
 
-    public static StringVariableResult setVariableValue(String variableName, String value){
-        return plugin.getVariablesManager().setVariableValue(null,variableName,value);
+    public static StringVariableResult setVariableValue(String variableName, String value) {
+        return plugin.getVariablesManager().setVariableValue(null, variableName, value);
     }
 
-    public static StringVariableResult setVariableValue(UUID uuid, String variableName, String value){
-        return plugin.getPlayerVariablesManager().setVariable(uuid,variableName,value);
+    public static StringVariableResult setVariableValue(UUID uuid, String variableName, String value) {
+        return plugin.getPlayerVariablesManager().setVariable(uuid, variableName, value);
     }
 
-    public static StringVariableResult setVariableValue(String playerName, String variableName, String value){
-        return plugin.getPlayerVariablesManager().setVariable(playerName,variableName,value);
+    public static StringVariableResult setVariableValue(String playerName, String variableName, String value) {
+        return plugin.getPlayerVariablesManager().setVariable(playerName, variableName, value);
     }
 
-    public static StringVariableResult getListVariableValueAtIndex(UUID uuid, String variableName, int index){
+    public static StringVariableResult getListVariableValueAtIndex(UUID uuid, String variableName, int index) {
         return plugin.getPlayerVariablesManager().getListVariableValueAtIndex(uuid, variableName, index);
     }
 
-    public static StringVariableResult getListVariableValueAtIndex(String playerName, String variableName, int index){
+    public static StringVariableResult getListVariableValueAtIndex(String playerName, String variableName, int index) {
         return plugin.getPlayerVariablesManager().getListVariableValueAtIndex(playerName, variableName, index);
     }
 
-    public static StringVariableResult getListVariableValueAtIndex(String variableName, int index){
+    public static StringVariableResult getListVariableValueAtIndex(String variableName, int index) {
         return plugin.getVariablesManager().getListVariablesManager().getListVariableValueAtIndex(null, variableName, index);
     }
 
-    public static String getListVariableDisplayAtIndex(String playerName, String variableName, int index){
-        StringVariableResult result = plugin.getVariablesManager().getListVariablesManager().getListVariableValueAtIndex(playerName,variableName,index);
-        if(result.getVariable() != null){
-            return plugin.getVariablesManager().getDisplayFromVariableValue(result.getVariable(),result.getResultValue());
+    public static String getListVariableDisplayAtIndex(String playerName, String variableName, int index) {
+        StringVariableResult result = plugin.getVariablesManager().getListVariablesManager().getListVariableValueAtIndex(playerName, variableName, index);
+        if (result.getVariable() != null) {
+            return plugin.getVariablesManager().getDisplayFromVariableValue(result.getVariable(), result.getResultValue());
         }
         return result.getResultValue();
     }
 
-    public static String getListVariableDisplayAtIndex(String variableName, int index){
-        StringVariableResult result = plugin.getVariablesManager().getListVariablesManager().getListVariableValueAtIndex(null,variableName,index);
-        if(result.getVariable() != null){
-            return plugin.getVariablesManager().getDisplayFromVariableValue(result.getVariable(),result.getResultValue());
+    public static String getListVariableDisplayAtIndex(String variableName, int index) {
+        StringVariableResult result = plugin.getVariablesManager().getListVariablesManager().getListVariableValueAtIndex(null, variableName, index);
+        if (result.getVariable() != null) {
+            return plugin.getVariablesManager().getDisplayFromVariableValue(result.getVariable(), result.getResultValue());
         }
         return result.getResultValue();
     }
 
-    public static StringVariableResult setListVariableValueAtIndex(String variableName, int index, String value){
-        return plugin.getVariablesManager().getListVariablesManager().setListVariableValue(null,variableName,index,value,false);
+    public static StringVariableResult setListVariableValueAtIndex(String variableName, int index, String value) {
+        return plugin.getVariablesManager().getListVariablesManager().setListVariableValue(null, variableName, index, value, false);
     }
 
-    public static StringVariableResult setListVariableValueAtIndex(UUID uuid, String variableName, int index, String value){
-        return plugin.getPlayerVariablesManager().setListVariableAtIndex(uuid,variableName,index,value);
+    public static StringVariableResult setListVariableValueAtIndex(UUID uuid, String variableName, int index, String value) {
+        return plugin.getPlayerVariablesManager().setListVariableAtIndex(uuid, variableName, index, value);
     }
 
-    public static StringVariableResult setListVariableValueAtIndex(String playerName, String variableName, int index, String value){
-        return plugin.getPlayerVariablesManager().setListVariableAtIndex(playerName,variableName,index,value);
+    public static StringVariableResult setListVariableValueAtIndex(String playerName, String variableName, int index, String value) {
+        return plugin.getPlayerVariablesManager().setListVariableAtIndex(playerName, variableName, index, value);
     }
 
-    public static int getListVariableLength(UUID uuid, String variableName){
+    public static int getListVariableLength(UUID uuid, String variableName) {
         ListVariableResult result = plugin.getPlayerVariablesManager().getListVariableValue(uuid, variableName);
-        if(result.isError() || result.getResultValue() == null){
+        if (result.isError() || result.getResultValue() == null) {
             return 0;
         }
         return result.getResultValue().size();
     }
 
-    public static int getListVariableLength(String playerName, String variableName){
+    public static int getListVariableLength(String playerName, String variableName) {
         ListVariableResult result = plugin.getPlayerVariablesManager().getListVariableValue(playerName, variableName);
-        if(result.isError() || result.getResultValue() == null){
+        if (result.isError() || result.getResultValue() == null) {
             return 0;
         }
         return result.getResultValue().size();
     }
 
-    public static int getListVariableLength(String variableName){
+    public static int getListVariableLength(String variableName) {
         ListVariableResult result = plugin.getVariablesManager().getListVariablesManager().getListVariableValue(null, variableName, false);
-        if(result.isError() || result.getResultValue() == null){
+        if (result.isError() || result.getResultValue() == null) {
             return 0;
         }
         return result.getResultValue().size();
     }
 
-    public static ServerVariablesPlayer getPlayerByName(String playerName){
+    public static ServerVariablesPlayer getPlayerByName(String playerName) {
         return plugin.getPlayerVariablesManager().getPlayerByName(playerName);
     }
 
-    public static ServerVariablesPlayer getPlayerByUUID(UUID uuid){
+    public static ServerVariablesPlayer getPlayerByUUID(UUID uuid) {
         return plugin.getPlayerVariablesManager().getPlayerByUUID(uuid);
     }
 
-    public static String getStringVariableInitialValue(String variableName){
+    public static String getStringVariableInitialValue(String variableName) {
         StringVariable variable = (StringVariable) plugin.getVariablesManager().getVariable(variableName);
-        if(variable == null){
+        if (variable == null) {
             return null;
         }
         return variable.getInitialValue();
     }
 
-    public static List<String> getListVariableInitialValue(String variableName){
+    public static List<String> getListVariableInitialValue(String variableName) {
         ListVariable variable = (ListVariable) plugin.getVariablesManager().getVariable(variableName);
-        if(variable == null){
+        if (variable == null) {
             return null;
         }
         return variable.getInitialValue();
     }
 
-    public static boolean listVariableContainsValue(String playerName, String variableName,String value){
+    public static boolean listVariableContainsValue(String playerName, String variableName, String value) {
         ListVariableResult result = plugin.getPlayerVariablesManager().getListVariableValue(playerName, variableName);
-        if(result.isError() || result.getResultValue() == null){
+        if (result.isError() || result.getResultValue() == null) {
             return false;
         }
         return result.getResultValue().contains(value);
     }
 
-    public static boolean listVariableContainsValue(String variableName,String value){
+    public static boolean listVariableContainsValue(String variableName, String value) {
         ListVariableResult result = plugin.getVariablesManager().getListVariablesManager().getListVariableValue(null, variableName, false);
-        if(result.isError() || result.getResultValue() == null){
+        if (result.isError() || result.getResultValue() == null) {
             return false;
         }
         return result.getResultValue().contains(value);
diff --git a/src/main/java/svar/ajneb97/api/ServerVariablesExpansion.java b/src/main/java/svar/ajneb97/api/ServerVariablesExpansion.java
index 96b9cd5..f6d23d3 100644
--- a/src/main/java/svar/ajneb97/api/ServerVariablesExpansion.java
+++ b/src/main/java/svar/ajneb97/api/ServerVariablesExpansion.java
@@ -2,47 +2,49 @@
 
 import org.bukkit.entity.Player;
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
+import org.jetbrains.annotations.NotNull;
 import svar.ajneb97.ServerVariables;
 import svar.ajneb97.model.StringVariableResult;
 
+@SuppressWarnings("deprecation")
 public class ServerVariablesExpansion extends PlaceholderExpansion {
 
     // We get an instance of the plugin later.
-    private ServerVariables plugin;
+    private final ServerVariables plugin;
 
     public ServerVariablesExpansion(ServerVariables plugin) {
-    	this.plugin = plugin;
+        this.plugin = plugin;
     }
 
     @Override
-    public boolean persist(){
+    public boolean persist() {
         return true;
     }
 
     @Override
-    public boolean canRegister(){
+    public boolean canRegister() {
         return true;
     }
 
     @Override
-    public String getAuthor(){
+    public @NotNull String getAuthor() {
         return "Ajneb97";
     }
 
     @Override
-    public String getIdentifier(){
+    public @NotNull String getIdentifier() {
         return "servervariables";
     }
 
     @Override
-    public String getVersion(){
+    public @NotNull String getVersion() {
         return plugin.getDescription().getVersion();
     }
 
     @Override
-    public String onPlaceholderRequest(Player player, String identifier){
+    public String onPlaceholderRequest(Player player, String identifier) {
         StringVariableResult result;
-        if(identifier.startsWith("list_")){
+        if (identifier.startsWith("list_")) {
             // %servervariables_list_globalvalue_<index>_<variable>%
             // %servervariables_list_globaldisplay_<index>_<variable>%
             // %servervariables_list_value_<index>_<variable>%
@@ -51,11 +53,11 @@ public String onPlaceholderRequest(Player player, String identifier){
             // %servervariables_list_length_<variable>%
             // %servervariables_list_globalcontains_<variable>:<value>%
             // %servervariables_list_contains_<variable>:<value>%
-            String identifierM = identifier.replace("list_","");
+            String identifierM = identifier.replace("list_", "");
             String[] sep = identifierM.split("_");
             String subIdentifier = sep[0];
 
-            switch(subIdentifier){
+            switch (subIdentifier) {
                 case "globalvalue": {
                     int index = Integer.parseInt(sep[1]);
                     String variableName = identifierM.substring(identifierM.indexOf(index + "_") + (index + "_").length());
@@ -110,49 +112,58 @@ public String onPlaceholderRequest(Player player, String identifier){
                     return ServerVariablesAPI.listVariableContainsValue(player.getName(), sep2[0], sep2[1]) + "";
                 }
             }
-        }else if(identifier.startsWith("globalvalue_")){
-        	// %servervariables_globalvalue_<variable>%
-        	String variableName = identifier.replace("globalvalue_", "");
+        } else if (identifier.startsWith("globalvalue_")) {
+            // %servervariables_globalvalue_<variable>%
+            String variableName = identifier.replace("globalvalue_", "");
             result = ServerVariablesAPI.getVariableValue(variableName);
             return result.getResultValue() != null ? result.getResultValue() : result.getErrorKey();
-        }else if(identifier.startsWith("globaldisplay_")){
+        } else if (identifier.startsWith("globaldisplay_")) {
             // %servervariables_globaldisplay_<variable>%
             String variableName = identifier.replace("globaldisplay_", "");
             return ServerVariablesAPI.getVariableDisplay(variableName);
-        }else if(identifier.startsWith("value_otherplayer_")){
+        } else if (identifier.startsWith("value_otherplayer_")) {
             // %servervariables_value_otherplayer_<player>:<variable>%
             String var = identifier.replace("value_otherplayer_", "");
             int index = var.indexOf(":");
-            String playerName = var.substring(0,index);
-            String variable = var.substring(index+1);
-            result = ServerVariablesAPI.getVariableValue(playerName,variable);
+            String playerName = var.substring(0, index);
+            String variable = var.substring(index + 1);
+            result = ServerVariablesAPI.getVariableValue(playerName, variable);
             return result.getResultValue() != null ? result.getResultValue() : result.getErrorKey();
-        }else if(identifier.startsWith("display_otherplayer_")){
+        } else if (identifier.startsWith("display_otherplayer_")) {
             // %servervariables_display_otherplayer_<player>:<variable>%
             String var = identifier.replace("display_otherplayer_", "");
             int index = var.indexOf(":");
-            String playerName = var.substring(0,index);
-            String variable = var.substring(index+1);
-            return ServerVariablesAPI.getVariableDisplay(playerName,variable);
-        }else if(identifier.startsWith("value_")){
+            String playerName = var.substring(0, index);
+            String variable = var.substring(index + 1);
+            return ServerVariablesAPI.getVariableDisplay(playerName, variable);
+        } else if (identifier.startsWith("value_")) {
             // %servervariables_value_<variable>%
-            if(player == null){
+            if (player == null) {
                 return "";
             }
             String variableName = identifier.replace("value_", "");
-            result = ServerVariablesAPI.getVariableValue(player.getName(),variableName);
+            result = ServerVariablesAPI.getVariableValue(player.getName(), variableName);
             return result.getResultValue() != null ? result.getResultValue() : result.getErrorKey();
-        }else if(identifier.startsWith("display_")) {
+        } else if (identifier.startsWith("display_")) {
             // %servervariables_display_<variable>%
-            if(player == null){
+            if (player == null) {
                 return "";
             }
             String variableName = identifier.replace("display_", "");
-            return ServerVariablesAPI.getVariableDisplay(player.getName(),variableName);
-        }else if(identifier.startsWith("initial_value_")){
+            return ServerVariablesAPI.getVariableDisplay(player.getName(), variableName);
+        } else if (identifier.startsWith("initial_value_")) {
             // %servervariables_initial_value_<variable>%
             String variableName = identifier.replace("initial_value_", "");
             return ServerVariablesAPI.getStringVariableInitialValue(variableName);
+        } else if (identifier.startsWith("predict_display_")) {
+            String[] split = identifier.replace("predict_display_", "").split(":");
+            if (split.length < 2) {
+                return "";
+            } else {
+                String variableName = split[0];
+                String future = split[1];
+                return this.plugin.getVariablesManager().getDisplayFromVariableValue(this.plugin.getVariablesManager().getVariable(variableName), future);
+            }
         }
 
         return null;
diff --git a/src/main/java/svar/ajneb97/api/StringVariableChangeEvent.java b/src/main/java/svar/ajneb97/api/StringVariableChangeEvent.java
index d2a3fc2..c1ec6b1 100644
--- a/src/main/java/svar/ajneb97/api/StringVariableChangeEvent.java
+++ b/src/main/java/svar/ajneb97/api/StringVariableChangeEvent.java
@@ -4,8 +4,9 @@
 import svar.ajneb97.model.structure.Variable;
 
 public class StringVariableChangeEvent extends VariableChangeEvent {
-    private String newValue;
-    private String oldValue;
+
+    private final String newValue;
+    private final String oldValue;
 
     public StringVariableChangeEvent(Player player, Variable variable, String newValue, String oldValue) {
         super(player, variable);
diff --git a/src/main/java/svar/ajneb97/api/VariableChangeEvent.java b/src/main/java/svar/ajneb97/api/VariableChangeEvent.java
index c0d0ef8..aaf6cbe 100644
--- a/src/main/java/svar/ajneb97/api/VariableChangeEvent.java
+++ b/src/main/java/svar/ajneb97/api/VariableChangeEvent.java
@@ -3,41 +3,41 @@
 import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
+import org.jetbrains.annotations.NotNull;
 import svar.ajneb97.model.structure.Variable;
 
+@SuppressWarnings("unused")
+public abstract class VariableChangeEvent extends Event {
 
-public abstract class VariableChangeEvent extends Event{
+    private final Player player; //Will be null if not a PLAYER variable
+    private final Variable variable;
+    private static final HandlerList handlers = new HandlerList();
 
-	private Player player; //Will be null if not a PLAYER variable
-	private Variable variable;
-	private static final HandlerList handlers = new HandlerList();
+    //Event called when a variable changes its value
+    public VariableChangeEvent(Player player, Variable variable) {
+        this.player = player;
+        this.variable = variable;
+    }
 
-	//Event called when a variable changes its value
-	public VariableChangeEvent(Player player, Variable variable){
-		this.player = player;
-		this.variable = variable;
-	}	
-	
-	public Player getPlayer() {
-		return player;
-	}
+    public Player getPlayer() {
+        return player;
+    }
 
-	public Variable getVariable() {
-		return variable;
-	}
+    public Variable getVariable() {
+        return variable;
+    }
 
-	public abstract Object getNewValue();
+    public abstract Object getNewValue();
 
-	public abstract Object getOldValue();
+    public abstract Object getOldValue();
 
-	@Override
-	public HandlerList getHandlers() {
-		// TODO Auto-generated method stub
-		return handlers;
-	}
-	
-	public static HandlerList getHandlerList() {
-	    return handlers;
-	}
+    @Override
+    public @NotNull HandlerList getHandlers() {
+        return handlers;
+    }
+
+    public static HandlerList getHandlerList() {
+        return handlers;
+    }
 
 }
diff --git a/src/main/java/svar/ajneb97/commands/MainCommand.java b/src/main/java/svar/ajneb97/commands/MainCommand.java
index 3368f61..31aa108 100644
--- a/src/main/java/svar/ajneb97/commands/MainCommand.java
+++ b/src/main/java/svar/ajneb97/commands/MainCommand.java
@@ -1,8 +1,6 @@
 package svar.ajneb97.commands;
 
 
-
-
 import org.bukkit.Bukkit;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
@@ -10,6 +8,7 @@
 import org.bukkit.command.TabCompleter;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
 import svar.ajneb97.ServerVariables;
 import svar.ajneb97.commands.subcommands.ListCommand;
 import svar.ajneb97.managers.MessagesManager;
@@ -24,312 +23,320 @@
 import java.util.Map;
 
 
+@SuppressWarnings("DataFlowIssue")
 public class MainCommand implements CommandExecutor, TabCompleter {
 
-	private ServerVariables plugin;
-	private ListCommand listCommand;
-	public MainCommand(ServerVariables plugin){
-		this.plugin = plugin;
-		this.listCommand = new ListCommand(plugin);
-	}
-
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if(!sender.hasPermission("servervariables.admin")){
-			return false;
-		}
-
-		FileConfiguration config = plugin.getConfigsManager().getMainConfigManager().getConfig();
-		MessagesManager msgManager = plugin.getMessagesManager();
-		if(args.length >= 1){
-			if(args[0].equalsIgnoreCase("set")){
-				set(sender,args,config,msgManager);
-			}else if(args[0].equalsIgnoreCase("reload")){
-				reload(sender,args,config,msgManager);
-			}else if(args[0].equalsIgnoreCase("get")){
-				get(sender,args,config,msgManager);
-			}else if(args[0].equalsIgnoreCase("add")){
-				add(sender,args,config,msgManager);
-			}else if(args[0].equalsIgnoreCase("reduce")){
-				reduce(sender,args,config,msgManager);
-			}else if(args[0].equalsIgnoreCase("reset")){
-				reset(sender,args,config,msgManager);
-			}else if(args[0].equalsIgnoreCase("list")){
-				list(sender,args,config,msgManager);
-			}else{
-				help(sender,args,config,msgManager);
-			}
-		}else{
-			help(sender,args,config,msgManager);
-		}
-
-		return true;
-
-	}
-
-	public void help(CommandSender sender, String[] args, FileConfiguration config, MessagesManager msgManager){
-		sender.sendMessage(MessagesManager.getLegacyColoredMessage("&7[ [ &8[&aServerVariables&8] &7] ]"));
-		sender.sendMessage(MessagesManager.getLegacyColoredMessage(" "));
-		sender.sendMessage(MessagesManager.getLegacyColoredMessage("&6/svar help &8Shows this message."));
-		sender.sendMessage(MessagesManager.getLegacyColoredMessage("&6/svar set <variable> <value> (optional)<player> (optional)silent:true &8Sets the value of a variable."));
-		sender.sendMessage(MessagesManager.getLegacyColoredMessage("&6/svar get <variable> (optional)<player> (optional)silent:true &8Gets the value from a variable."));
-		sender.sendMessage(MessagesManager.getLegacyColoredMessage("&6/svar add <variable> <value> (optional)<player> (optional)silent:true &8Adds a value to a variable (INTEGER or DOUBLE)."));
-		sender.sendMessage(MessagesManager.getLegacyColoredMessage("&6/svar reduce <variable> <value> (optional)<player> (optional)silent:true &8Reduces the value of a variable (INTEGER or DOUBLE)."));
-		sender.sendMessage(MessagesManager.getLegacyColoredMessage("&6/svar list <option> &8Manages a LIST type variable."));
-		sender.sendMessage(MessagesManager.getLegacyColoredMessage("&6/svar reset <variable> <value> (optional)<player> (optional)silent:true &8Resets the value of a variable."));
-		sender.sendMessage(MessagesManager.getLegacyColoredMessage("&6/svar reload &8Reloads the config."));
-		sender.sendMessage(MessagesManager.getLegacyColoredMessage(" "));
-		sender.sendMessage(MessagesManager.getLegacyColoredMessage("&7[ [ &8[&aServerVariables&8] &7] ]"));
-
-	}
-
-	public void set(CommandSender sender, String[] args, FileConfiguration config, MessagesManager msgManager){
-		//servervariables set <variable> <value> (Set global variable)
-		//servervariables set <variable> <value> <player> (Set player variable)
-		//servervariables set <variable> "<value with spaces>" <player>
-		if(args.length <= 2){
-			msgManager.sendMessage(sender,config.getString("messages.commandSetError"),true);
-			return;
-		}
-
-		String variableName = args[1];
-
-		ValueFromArgumentResult valueResult = OtherUtils.getValueFromArgument(args,2);
-		if(valueResult == null){
-			msgManager.sendMessage(sender,config.getString("messages.commandSetError"),true);
-			return;
-		}
-		String newValue = valueResult.getFinalValue();
-		int valueExtraArgs = valueResult.getExtraArgs();
-
-		String playerName = null;
-
-		if(args.length >= 4+valueExtraArgs && !args[3+valueExtraArgs].equals("silent:true")){
-			playerName = args[3+valueExtraArgs];
-		}
-		StringVariableResult result = plugin.getVariablesManager().setVariableValue(playerName,variableName,newValue);
-
-		boolean silent = args[args.length-1].equals("silent:true");
-
-		sendMessageSet(sender,result,msgManager,config,variableName,playerName,silent);
-	}
-
-	public void get(CommandSender sender, String[] args, FileConfiguration config, MessagesManager msgManager) {
-		//servervariables get <variable> (Get global variable)
-		//servervariables get <variable> <player> (Get player variable)
-		if (args.length <= 1) {
-			msgManager.sendMessage(sender, config.getString("messages.commandGetError"), true);
-			return;
-		}
-
-		String variableName = args[1];
-		String playerName = null;
-
-		if(args.length >= 3){
-			playerName = args[2];
-		}
-		StringVariableResult result = plugin.getVariablesManager().getVariableValue(playerName,variableName,false);
-
-		if(result.isError()){
-			msgManager.sendMessage(sender,result.getErrorMessage(),true);
-		}else{
-			if(playerName != null){
-				msgManager.sendMessage(sender,config.getString("messages.commandGetCorrectPlayer").replace("%variable%",variableName)
-						.replace("%value%",result.getResultValue()).replace("%player%",playerName),true);
-			}else{
-				msgManager.sendMessage(sender,config.getString("messages.commandGetCorrect").replace("%variable%",variableName)
-						.replace("%value%",result.getResultValue()),true);
-			}
-		}
-	}
-
-	public void add(CommandSender sender, String[] args, FileConfiguration config, MessagesManager msgManager){
-		//servervariables add <variable> <value> (Add value to server variable if INTEGER or DOUBLE)
-		//servervariables add <variable> <value> <player> (Add value to player variable if INTEGER or DOUBLE)
-		if(args.length <= 2){
-			msgManager.sendMessage(sender,config.getString("messages.commandAddError"),true);
-			return;
-		}
-
-		String variableName = args[1];
-		String value = args[2];
-		String playerName = null;
-
-		if(args.length >= 4 && !args[3].equals("silent:true")){
-			playerName = args[3];
-		}
-		StringVariableResult result = plugin.getVariablesManager().modifyVariable(playerName,variableName,value,true);
-
-		boolean silent = args[args.length-1].equals("silent:true");
-
-		sendMessageSet(sender,result,msgManager,config,variableName,playerName,silent);
-	}
-
-	public void reduce(CommandSender sender, String[] args, FileConfiguration config, MessagesManager msgManager){
-		//servervariables reduce <variable> <value> (Reduce value of server variable if INTEGER or DOUBLE)
-		//servervariables reduce <variable> <value> <player> (Reduce value of player variable if INTEGER or DOUBLE)
-		if(args.length <= 2){
-			msgManager.sendMessage(sender,config.getString("messages.commandReduceError"),true);
-			return;
-		}
-
-		String variableName = args[1];
-		String value = args[2];
-		String playerName = null;
-
-		if(args.length >= 4 && !args[3].equals("silent:true")){
-			playerName = args[3];
-		}
-		StringVariableResult result = plugin.getVariablesManager().modifyVariable(playerName,variableName,value,false);
-
-		boolean silent = args[args.length-1].equals("silent:true");
-
-		sendMessageSet(sender,result,msgManager,config,variableName,playerName,silent);
-	}
-
-	public void reset(CommandSender sender, String[] args, FileConfiguration config, MessagesManager msgManager){
-		//servervariables reset <variable> (Resets a global variable to the default value)
-		//servervariables reset <variable> <player> (Resets a player variable to the default value)
-		if(args.length <= 1){
-			msgManager.sendMessage(sender,config.getString("messages.commandResetError"),true);
-			return;
-		}
-
-		String variableName = args[1];
-		String playerName = null;
-
-		StringVariableResult result;
-		if(args.length >= 3 && !args[2].equals("silent:true")){
-			playerName = args[2];
-			result = plugin.getVariablesManager().resetVariable(playerName,variableName,playerName.equals("*"));
-		}else{
-			result = plugin.getVariablesManager().resetVariable(null,variableName,false);
-		}
-
-		boolean silent = args[args.length-1].equals("silent:true");
-
-		if(result.isError()){
-			msgManager.sendMessage(sender,result.getErrorMessage(),true);
-		}else{
-			if(silent){
-				return;
-			}
-			if(playerName != null){
-				if(playerName.equals("*")){
-					msgManager.sendMessage(sender,config.getString("messages.commandResetCorrectAll").replace("%variable%",variableName),true);
-				}else{
-					msgManager.sendMessage(sender,config.getString("messages.commandResetCorrectPlayer").replace("%variable%",variableName)
-							.replace("%player%",playerName),true);
-				}
-			}else{
-				msgManager.sendMessage(sender,config.getString("messages.commandResetCorrect").replace("%variable%",variableName),true);
-			}
-		}
-	}
-
-	public void list(CommandSender sender, String[] args, FileConfiguration config, MessagesManager msgManager) {
-		listCommand.command(sender,args,config,msgManager);
-	}
-
-	private void sendMessageSet(CommandSender sender, StringVariableResult result, MessagesManager msgManager, FileConfiguration config,
-								String variableName, String playerName, boolean silent){
-		boolean silentCommandsHideErrors = plugin.getConfigsManager().getMainConfigManager().isSilentCommandsHideErrors();
-		if(result.isError()){
-			if(silent && silentCommandsHideErrors){
-				return;
-			}
-			msgManager.sendMessage(sender,result.getErrorMessage(),true);
-		}else{
-			if(silent){
-				return;
-			}
-			if(playerName != null){
-				msgManager.sendMessage(sender,config.getString("messages.commandSetCorrectPlayer").replace("%variable%",variableName)
-						.replace("%value%",result.getResultValue()).replace("%player%",playerName),true);
-			}else{
-				msgManager.sendMessage(sender,config.getString("messages.commandSetCorrect").replace("%variable%",variableName)
-						.replace("%value%",result.getResultValue()),true);
-			}
-		}
-	}
-
-	public void reload(CommandSender sender, String[] args, FileConfiguration config, MessagesManager msgManager){
-		// /servervariables reload
-		if(!plugin.getConfigsManager().reloadConfigs()){
-			sender.sendMessage(ServerVariables.prefix+MessagesManager.getLegacyColoredMessage("&cThere was an error reloading the config, check the console."));
-			return;
-		}
-
-		msgManager.sendMessage(sender,config.getString("messages.pluginReloaded"),true);
-	}
-
-
-	@Override
-	public List<String> onTabComplete(CommandSender sender, Command command, String label, String[] args) {
-		if(!sender.hasPermission("servervariables.admin")){
-			return null;
-		}
+    private final ServerVariables plugin;
+    private final ListCommand listCommand;
+
+    public MainCommand(ServerVariables plugin) {
+        this.plugin = plugin;
+        this.listCommand = new ListCommand(plugin);
+    }
+
+    public boolean onCommand(CommandSender sender, @NotNull Command command, @NotNull String label, String[] args) {
+        if (!sender.hasPermission("servervariables.admin")) {
+            return false;
+        }
+
+        FileConfiguration config = plugin.getConfigsManager().getMainConfigManager().getConfig();
+        MessagesManager msgManager = plugin.getMessagesManager();
+        if (args.length >= 1) {
+            if (args[0].equalsIgnoreCase("set")) {
+                set(sender, args, config, msgManager);
+            } else if (args[0].equalsIgnoreCase("reload")) {
+                reload(sender, config, msgManager);
+            } else if (args[0].equalsIgnoreCase("get")) {
+                get(sender, args, config, msgManager);
+            } else if (args[0].equalsIgnoreCase("add")) {
+                add(sender, args, config, msgManager);
+            } else if (args[0].equalsIgnoreCase("reduce")) {
+                reduce(sender, args, config, msgManager);
+            } else if (args[0].equalsIgnoreCase("reset")) {
+                reset(sender, args, config, msgManager);
+            } else if (args[0].equalsIgnoreCase("list")) {
+                list(sender, args, config, msgManager);
+            } else {
+                help(sender);
+            }
+        } else {
+            help(sender);
+        }
+
+        return true;
+
+    }
+
+    public void help(CommandSender sender) {
+        sender.sendMessage(MessagesManager.getLegacyColoredMessage("&7[ [ &8[&aServerVariables&8] &7] ]"));
+        sender.sendMessage(MessagesManager.getLegacyColoredMessage(" "));
+        sender.sendMessage(MessagesManager.getLegacyColoredMessage("&6/svar help &8Shows this message."));
+        sender.sendMessage(MessagesManager.getLegacyColoredMessage("&6/svar set <variable> <value> (optional)<player> (optional)silent:true &8Sets the value of a variable."));
+        sender.sendMessage(MessagesManager.getLegacyColoredMessage("&6/svar get <variable> (optional)<player> (optional)silent:true &8Gets the value from a variable."));
+        sender.sendMessage(MessagesManager.getLegacyColoredMessage("&6/svar add <variable> <value> (optional)<player> (optional)silent:true &8Adds a value to a variable (INTEGER or DOUBLE)."));
+        sender.sendMessage(MessagesManager.getLegacyColoredMessage("&6/svar reduce <variable> <value> (optional)<player> (optional)silent:true &8Reduces the value of a variable (INTEGER or DOUBLE)."));
+        sender.sendMessage(MessagesManager.getLegacyColoredMessage("&6/svar list <option> &8Manages a LIST type variable."));
+        sender.sendMessage(MessagesManager.getLegacyColoredMessage("&6/svar reset <variable> <value> (optional)<player> (optional)silent:true &8Resets the value of a variable."));
+        sender.sendMessage(MessagesManager.getLegacyColoredMessage("&6/svar reload &8Reloads the config."));
+        sender.sendMessage(MessagesManager.getLegacyColoredMessage(" "));
+        sender.sendMessage(MessagesManager.getLegacyColoredMessage("&7[ [ &8[&aServerVariables&8] &7] ]"));
+
+    }
+
+    public void set(CommandSender sender, String[] args, FileConfiguration config, MessagesManager msgManager) {
+        //servervariables set <variable> <value> (Set global variable)
+        //servervariables set <variable> <value> <player> (Set player variable)
+        //servervariables set <variable> "<value with spaces>" <player>
+        if (args.length <= 2) {
+            msgManager.sendMessage(sender, config.getString("messages.commandSetError"), true);
+            return;
+        }
+
+        String variableName = args[1];
+
+        ValueFromArgumentResult valueResult = OtherUtils.getValueFromArgument(args, 2);
+        if (valueResult == null) {
+            msgManager.sendMessage(sender, config.getString("messages.commandSetError"), true);
+            return;
+        }
+        String newValue = valueResult.getFinalValue();
+        int valueExtraArgs = valueResult.getExtraArgs();
+
+        String playerName = null;
+
+        if (args.length >= 4 + valueExtraArgs && !args[3 + valueExtraArgs].equals("silent:true")) {
+            playerName = args[3 + valueExtraArgs];
+        }
+        StringVariableResult result = plugin.getVariablesManager().setVariableValue(playerName, variableName, newValue);
+
+        boolean silent = args[args.length - 1].equals("silent:true");
+
+        sendMessageSet(sender, result, msgManager, config, variableName, playerName, silent);
+    }
+
+    public void get(CommandSender sender, String[] args, FileConfiguration config, MessagesManager msgManager) {
+        //servervariables get <variable> (Get global variable)
+        //servervariables get <variable> <player> (Get player variable)
+        if (args.length <= 1) {
+            msgManager.sendMessage(sender, config.getString("messages.commandGetError"), true);
+            return;
+        }
+
+        String variableName = args[1];
+        String playerName = null;
+
+        if (args.length >= 3) {
+            playerName = args[2];
+        }
+        StringVariableResult result = plugin.getVariablesManager().getVariableValue(playerName, variableName, false);
+
+        if (result.isError()) {
+            msgManager.sendMessage(sender, result.getErrorMessage(), true);
+        } else {
+            if (playerName != null) {
+                msgManager.sendMessage(sender, config.getString("messages.commandGetCorrectPlayer").replace("%variable%", variableName)
+                        .replace("%value%", result.getResultValue()).replace("%player%", playerName), true);
+            } else {
+                msgManager.sendMessage(sender, config.getString("messages.commandGetCorrect").replace("%variable%", variableName)
+                        .replace("%value%", result.getResultValue()), true);
+            }
+        }
+    }
+
+    public void add(CommandSender sender, String[] args, FileConfiguration config, MessagesManager msgManager) {
+        //servervariables add <variable> <value> (Add value to server variable if INTEGER or DOUBLE)
+        //servervariables add <variable> <value> <player> (Add value to player variable if INTEGER or DOUBLE)
+        if (args.length <= 2) {
+            msgManager.sendMessage(sender, config.getString("messages.commandAddError"), true);
+            return;
+        }
+
+        String variableName = args[1];
+        String value = args[2];
+        String playerName = null;
+
+        if (args.length >= 4 && !args[3].equals("silent:true")) {
+            playerName = args[3];
+        }
+        StringVariableResult result = plugin.getVariablesManager().modifyVariable(playerName, variableName, value, true);
+
+        boolean silent = args[args.length - 1].equals("silent:true");
+
+        sendMessageSet(sender, result, msgManager, config, variableName, playerName, silent);
+    }
+
+    public void reduce(CommandSender sender, String[] args, FileConfiguration config, MessagesManager msgManager) {
+        //servervariables reduce <variable> <value> (Reduce value of server variable if INTEGER or DOUBLE)
+        //servervariables reduce <variable> <value> <player> (Reduce value of player variable if INTEGER or DOUBLE)
+        if (args.length <= 2) {
+            msgManager.sendMessage(sender, config.getString("messages.commandReduceError"), true);
+            return;
+        }
+
+        String variableName = args[1];
+        String value = args[2];
+        String playerName = null;
+
+        if (args.length >= 4 && !args[3].equals("silent:true")) {
+            playerName = args[3];
+        }
+        StringVariableResult result = plugin.getVariablesManager().modifyVariable(playerName, variableName, value, false);
+
+        boolean silent = args[args.length - 1].equals("silent:true");
+
+        sendMessageSet(sender, result, msgManager, config, variableName, playerName, silent);
+    }
+
+    public void reset(CommandSender sender, String[] args, FileConfiguration config, MessagesManager msgManager) {
+        //servervariables reset <variable> (Resets a global variable to the default value)
+        //servervariables reset <variable> <player> (Resets a player variable to the default value)
+        if (args.length <= 1) {
+            msgManager.sendMessage(sender, config.getString("messages.commandResetError"), true);
+            return;
+        }
+
+        String variableName = args[1];
+        String playerName = null;
+
+        StringVariableResult result;
+        if (args.length >= 3 && !args[2].equals("silent:true")) {
+            playerName = args[2];
+            result = plugin.getVariablesManager().resetVariable(playerName, variableName, playerName.equals("*"));
+        } else {
+            result = plugin.getVariablesManager().resetVariable(null, variableName, false);
+        }
+
+        boolean silent = args[args.length - 1].equals("silent:true");
+
+        if (result.isError()) {
+            msgManager.sendMessage(sender, result.getErrorMessage(), true);
+        } else {
+            if (silent) {
+                return;
+            }
+            if (playerName != null) {
+                if (playerName.equals("*")) {
+                    msgManager.sendMessage(sender, config.getString("messages.commandResetCorrectAll").replace("%variable%", variableName), true);
+                } else {
+                    msgManager.sendMessage(sender, config.getString("messages.commandResetCorrectPlayer").replace("%variable%", variableName)
+                            .replace("%player%", playerName), true);
+                }
+            } else {
+                msgManager.sendMessage(sender, config.getString("messages.commandResetCorrect").replace("%variable%", variableName), true);
+            }
+        }
+    }
+
+    public void list(CommandSender sender, String[] args, FileConfiguration config, MessagesManager msgManager) {
+        listCommand.command(sender, args, config, msgManager);
+    }
+
+    private void sendMessageSet(CommandSender sender, StringVariableResult result, MessagesManager msgManager, FileConfiguration config,
+                                String variableName, String playerName, boolean silent) {
+        boolean silentCommandsHideErrors = plugin.getConfigsManager().getMainConfigManager().isSilentCommandsHideErrors();
+        if (result.isError()) {
+            if (silent && silentCommandsHideErrors) {
+                return;
+            }
+            msgManager.sendMessage(sender, result.getErrorMessage(), true);
+        } else {
+            if (silent) {
+                return;
+            }
+            if (playerName != null) {
+                msgManager.sendMessage(sender, config.getString("messages.commandSetCorrectPlayer").replace("%variable%", variableName)
+                        .replace("%value%", result.getResultValue()).replace("%player%", playerName), true);
+            } else {
+                msgManager.sendMessage(sender, config.getString("messages.commandSetCorrect").replace("%variable%", variableName)
+                        .replace("%value%", result.getResultValue()), true);
+            }
+        }
+    }
+
+    public void reload(CommandSender sender, FileConfiguration config, MessagesManager msgManager) {
+        // /servervariables reload
+        if (!plugin.getConfigsManager().reloadConfigs()) {
+            sender.sendMessage(ServerVariables.prefix + MessagesManager.getLegacyColoredMessage("&cThere was an error reloading the config, check the console."));
+            return;
+        }
+
+        msgManager.sendMessage(sender, config.getString("messages.pluginReloaded"), true);
+    }
+
+
+    @Override
+    public List<String> onTabComplete(CommandSender sender, @NotNull Command command, @NotNull String label, String[] args) {
+        if (!sender.hasPermission("servervariables.admin")) {
+            return null;
+        }
 
         List<String> completions = new ArrayList<>();
-        if(args.length == 1){
-			//Show all commands
+        if (args.length == 1) {
+            //Show all commands
             List<String> commands = new ArrayList<>();
-			commands.add("reload");commands.add("set");commands.add("get");commands.add("add");commands.add("reduce");
-			commands.add("reset");commands.add("help");commands.add("list");
-			for(String c : commands) {
-				if(args[0].isEmpty() || c.startsWith(args[0].toLowerCase())) {
-					completions.add(c);
-				}
-			}
-			return completions;
-		}else{
-            Map<String,Variable> variables = plugin.getVariablesManager().getVariables();
-			if(args[0].equalsIgnoreCase("list")){
-				return listCommand.onTabComplete(sender,args,variables);
-			}
-			if((args[0].equalsIgnoreCase("set") || args[0].equalsIgnoreCase("get") || args[0].equalsIgnoreCase("add")
-					|| args[0].equalsIgnoreCase("reduce") || args[0].equalsIgnoreCase("reset"))
-					&& args.length == 2) {
-				String argVariable = args[1];
-				for(Map.Entry<String, Variable> entry : variables.entrySet()) {
-					Variable variable = entry.getValue();
-					if((argVariable.isEmpty() || variable.getName().toLowerCase().startsWith(argVariable.toLowerCase())) && !variable.getValueType().equals(ValueType.LIST)) {
-						completions.add(variable.getName());
-					}
-				}
-				return completions;
-			}else if(args[0].equalsIgnoreCase("set") && args.length == 3){
-				Variable variable = plugin.getVariablesManager().getVariable(args[1]);
-				String argVariable = args[2];
-
-				if(variable != null){
-					List<String> possibleRealValues = variable.getPossibleRealValues();
-					for(String possibleValue : possibleRealValues){
-						if(argVariable.isEmpty() || possibleValue.toLowerCase().startsWith(argVariable.toLowerCase())) {
-							completions.add(possibleValue);
-						}
-					}
-				}
-				completions.add("<value>");
-				return completions;
-			}else if((args[0].equalsIgnoreCase("add") || args[0].equalsIgnoreCase("reduce")) && args.length == 3){
-				completions.add("<value>");
-				return completions;
-			}else if(args[0].equalsIgnoreCase("reset") && args.length == 3) {
-				for(Player p : Bukkit.getOnlinePlayers()) {
-					if(args[2].isEmpty() || p.getName().startsWith(args[2].toLowerCase())){
-						completions.add(p.getName());
-					}
-				}
-				addAllWord(completions,args[2]);
-				return completions;
-			}
-		}
-		return null;
-	}
-
-	private void addAllWord(List<String> completions,String arg){
-		if(arg.isEmpty() || "*".startsWith(arg.toLowerCase())) {
-			completions.add("*");
-		}
-	}
+            commands.add("reload");
+            commands.add("set");
+            commands.add("get");
+            commands.add("add");
+            commands.add("reduce");
+            commands.add("reset");
+            commands.add("help");
+            commands.add("list");
+            for (String c : commands) {
+                if (args[0].isEmpty() || c.startsWith(args[0].toLowerCase())) {
+                    completions.add(c);
+                }
+            }
+            return completions;
+        } else {
+            Map<String, Variable> variables = plugin.getVariablesManager().getVariables();
+            if (args[0].equalsIgnoreCase("list")) {
+                return listCommand.onTabComplete(args, variables);
+            }
+            if ((args[0].equalsIgnoreCase("set") || args[0].equalsIgnoreCase("get") || args[0].equalsIgnoreCase("add")
+                    || args[0].equalsIgnoreCase("reduce") || args[0].equalsIgnoreCase("reset"))
+                    && args.length == 2) {
+                String argVariable = args[1];
+                for (Map.Entry<String, Variable> entry : variables.entrySet()) {
+                    Variable variable = entry.getValue();
+                    if ((argVariable.isEmpty() || variable.getName().toLowerCase().startsWith(argVariable.toLowerCase())) && !variable.getValueType().equals(ValueType.LIST)) {
+                        completions.add(variable.getName());
+                    }
+                }
+                return completions;
+            } else if (args[0].equalsIgnoreCase("set") && args.length == 3) {
+                Variable variable = plugin.getVariablesManager().getVariable(args[1]);
+                String argVariable = args[2];
+
+                if (variable != null) {
+                    List<String> possibleRealValues = variable.getPossibleRealValues();
+                    for (String possibleValue : possibleRealValues) {
+                        if (argVariable.isEmpty() || possibleValue.toLowerCase().startsWith(argVariable.toLowerCase())) {
+                            completions.add(possibleValue);
+                        }
+                    }
+                }
+                completions.add("<value>");
+                return completions;
+            } else if ((args[0].equalsIgnoreCase("add") || args[0].equalsIgnoreCase("reduce")) && args.length == 3) {
+                completions.add("<value>");
+                return completions;
+            } else if (args[0].equalsIgnoreCase("reset") && args.length == 3) {
+                for (Player p : Bukkit.getOnlinePlayers()) {
+                    if (args[2].isEmpty() || p.getName().startsWith(args[2].toLowerCase())) {
+                        completions.add(p.getName());
+                    }
+                }
+                addAllWord(completions, args[2]);
+                return completions;
+            }
+        }
+        return null;
+    }
+
+    private void addAllWord(List<String> completions, String arg) {
+        if (arg.isEmpty() || "*".startsWith(arg.toLowerCase())) {
+            completions.add("*");
+        }
+    }
 }
diff --git a/src/main/java/svar/ajneb97/commands/subcommands/ListCommand.java b/src/main/java/svar/ajneb97/commands/subcommands/ListCommand.java
index 659ebbe..66a370d 100644
--- a/src/main/java/svar/ajneb97/commands/subcommands/ListCommand.java
+++ b/src/main/java/svar/ajneb97/commands/subcommands/ListCommand.java
@@ -1,7 +1,6 @@
 package svar.ajneb97.commands.subcommands;
 
 import org.bukkit.Bukkit;
-import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.entity.Player;
@@ -18,131 +17,133 @@
 import java.util.List;
 import java.util.Map;
 
+@SuppressWarnings("DataFlowIssue")
 public class ListCommand {
 
-    private ServerVariables plugin;
-    public ListCommand(ServerVariables plugin){
+    private final ServerVariables plugin;
+
+    public ListCommand(ServerVariables plugin) {
         this.plugin = plugin;
     }
 
     public void command(CommandSender sender, String[] args, FileConfiguration config, MessagesManager msgManager) {
-        if(args.length <= 1){
-            msgManager.sendMessage(sender,config.getString("messages.commandListError"),true);
+        if (args.length <= 1) {
+            msgManager.sendMessage(sender, config.getString("messages.commandListError"), true);
             return;
         }
 
-        switch(args[1]){
+        switch (args[1]) {
             case "get":
-                get(sender,args,config,msgManager);
+                get(sender, args, config, msgManager);
                 break;
             case "set":
-                set(sender,args,config,msgManager);
+                set(sender, args, config, msgManager);
                 break;
             case "add":
-                add(sender,args,config,msgManager);
+                add(sender, args, config, msgManager);
                 break;
             case "removevalue":
-                removevalue(sender,args,config,msgManager);
+                removevalue(sender, args, config, msgManager);
                 break;
             case "removeindex":
-                removeindex(sender,args,config,msgManager);
+                removeindex(sender, args, config, msgManager);
                 break;
             case "reset":
-                reset(sender,args,config,msgManager);
+                reset(sender, args, config, msgManager);
                 break;
             case "display":
-                display(sender,args,config,msgManager);
+                display(sender, args, config, msgManager);
                 break;
             default:
-                msgManager.sendMessage(sender,config.getString("messages.commandListError"),true);
+                msgManager.sendMessage(sender, config.getString("messages.commandListError"), true);
         }
     }
 
-    private void get(CommandSender sender, String[] args, FileConfiguration config, MessagesManager msgManager){
-        // Get value from certain index
+    private void get(CommandSender sender, String[] args, FileConfiguration config, MessagesManager msgManager) {
+        // Get value from a certain index
         //servervariables list get <variable> <index>
         //servervariables list get <variable> <index> <player>
 
-        if(args.length <= 3){
-            msgManager.sendMessage(sender,config.getString("messages.commandListGetError"),true);
+        if (args.length <= 3) {
+            msgManager.sendMessage(sender, config.getString("messages.commandListGetError"), true);
             return;
         }
 
         String variableName = args[2];
-        int index = getIndex(args[3],sender,msgManager,config);
-        if(index == -1){
+        int index = getIndex(args[3], sender, msgManager, config);
+        if (index == -1) {
             return;
         }
         String playerName = null;
 
-        if(args.length >= 5){
+        if (args.length >= 5) {
             playerName = args[4];
         }
-        StringVariableResult result = plugin.getVariablesManager().getListVariablesManager().getListVariableValueAtIndex(playerName,variableName,index);
-
-        if(result.isError()){
-            msgManager.sendMessage(sender,result.getErrorMessage(),true);
-        }else{
-            if(playerName != null){
-                msgManager.sendMessage(sender,config.getString("messages.commandListGetCorrectPlayer").replace("%variable%",variableName)
-                        .replace("%value%",result.getResultValue()).replace("%player%",playerName)
-                        .replace("%index%",index+""),true);
-            }else{
-                msgManager.sendMessage(sender,config.getString("messages.commandListGetCorrect").replace("%variable%",variableName)
-                        .replace("%value%",result.getResultValue()).replace("%index%",index+""),true);
+        StringVariableResult result = plugin.getVariablesManager().getListVariablesManager().getListVariableValueAtIndex(playerName, variableName, index);
+
+        if (result.isError()) {
+            msgManager.sendMessage(sender, result.getErrorMessage(), true);
+        } else {
+            if (playerName != null) {
+                msgManager.sendMessage(sender, config.getString("messages.commandListGetCorrectPlayer").replace("%variable%", variableName)
+                        .replace("%value%", result.getResultValue()).replace("%player%", playerName)
+                        .replace("%index%", index + ""), true);
+            } else {
+                msgManager.sendMessage(sender, config.getString("messages.commandListGetCorrect").replace("%variable%", variableName)
+                        .replace("%value%", result.getResultValue()).replace("%index%", index + ""), true);
             }
         }
     }
 
-    private void set(CommandSender sender, String[] args, FileConfiguration config, MessagesManager msgManager){
+    private void set(CommandSender sender, String[] args, FileConfiguration config, MessagesManager msgManager) {
         // Set value at certain index
         //servervariables list set <variable> <index> <value>
         //servervariables list set <variable> <index> <value> <player>
 
-        if(args.length <= 4){
-            msgManager.sendMessage(sender,config.getString("messages.commandListSetError"),true);
+        if (args.length <= 4) {
+            msgManager.sendMessage(sender, config.getString("messages.commandListSetError"), true);
             return;
         }
 
         String variableName = args[2];
-        int index = getIndex(args[3],sender,msgManager,config);
-        if(index == -1){
+        int index = getIndex(args[3], sender, msgManager, config);
+        if (index == -1) {
             return;
         }
 
-        ValueFromArgumentResult valueResult = OtherUtils.getValueFromArgument(args,4);
-        if(valueResult == null){
-            msgManager.sendMessage(sender,config.getString("messages.commandListSetError"),true);
+        ValueFromArgumentResult valueResult = OtherUtils.getValueFromArgument(args, 4);
+        if (valueResult == null) {
+            msgManager.sendMessage(sender, config.getString("messages.commandListSetError"), true);
             return;
         }
         String newValue = valueResult.getFinalValue();
         int valueExtraArgs = valueResult.getExtraArgs();
 
         String playerName = null;
-        StringVariableResult result = null;
-        if(args.length >= 6+valueExtraArgs && !args[5+valueExtraArgs].equals("silent:true")) {
+        StringVariableResult result;
+        if (args.length >= 6 + valueExtraArgs && !args[5 + valueExtraArgs].equals("silent:true")) {
             playerName = args[5 + valueExtraArgs];
         }
-        result = plugin.getVariablesManager().getListVariablesManager().setListVariableValue(playerName,variableName,index,newValue,false);
+        result = plugin.getVariablesManager().getListVariablesManager().setListVariableValue(playerName, variableName, index, newValue, false);
 
-        boolean silent = args[args.length-1].equals("silent:true");
+        boolean silent = args[args.length - 1].equals("silent:true");
 
-        sendMessageSet(sender,result,msgManager,config,variableName,playerName,index,silent);
+        sendMessageSet(sender, result, msgManager, config, variableName, playerName, index, silent);
     }
 
-    private void add(CommandSender sender, String[] args, FileConfiguration config, MessagesManager msgManager){
+    private void add(CommandSender sender, String[] args, FileConfiguration config, MessagesManager msgManager) {
         // Add value to list
         //servervariables list add <variable> <value>
         //servervariables list add <variable> <value> <player>
-        if(args.length <= 3){
-            msgManager.sendMessage(sender,config.getString("messages.commandListAddError"),true);
+        if (args.length <= 3) {
+            msgManager.sendMessage(sender, config.getString("messages.commandListAddError"), true);
             return;
         }
 
         String variableName = args[2];
-        ValueFromArgumentResult valueResult = OtherUtils.getValueFromArgument(args,3);
-        if(valueResult == null){
-            msgManager.sendMessage(sender,config.getString("messages.commandListAddError"),true);
+        ValueFromArgumentResult valueResult = OtherUtils.getValueFromArgument(args, 3);
+        if (valueResult == null) {
+            msgManager.sendMessage(sender, config.getString("messages.commandListAddError"), true);
             return;
         }
         String newValue = valueResult.getFinalValue();
@@ -150,30 +151,30 @@ private void add(CommandSender sender, String[] args, FileConfiguration config,
 
         String playerName = null;
         StringVariableResult result;
-        if(args.length >= 5+valueExtraArgs && !args[4+valueExtraArgs].equals("silent:true")) {
+        if (args.length >= 5 + valueExtraArgs && !args[4 + valueExtraArgs].equals("silent:true")) {
             playerName = args[4 + valueExtraArgs];
         }
-        result = plugin.getVariablesManager().getListVariablesManager().setListVariableValue(playerName,variableName,-1,newValue,true);
+        result = plugin.getVariablesManager().getListVariablesManager().setListVariableValue(playerName, variableName, -1, newValue, true);
 
-        boolean silent = args[args.length-1].equals("silent:true");
+        boolean silent = args[args.length - 1].equals("silent:true");
 
-        sendMessageSet(sender,result,msgManager,config,variableName,playerName,result.getIndex(),silent);
+        sendMessageSet(sender, result, msgManager, config, variableName, playerName, result.getIndex(), silent);
     }
 
-    private void removevalue(CommandSender sender, String[] args, FileConfiguration config, MessagesManager msgManager){
+    private void removevalue(CommandSender sender, String[] args, FileConfiguration config, MessagesManager msgManager) {
         // Remove value from list
         //servervariables list removevalue <variable> <value>
         //servervariables list removevalue <variable> <value> <player>
 
-        if(args.length <= 3){
-            msgManager.sendMessage(sender,config.getString("messages.commandListRemoveValueError"),true);
+        if (args.length <= 3) {
+            msgManager.sendMessage(sender, config.getString("messages.commandListRemoveValueError"), true);
             return;
         }
 
         String variableName = args[2];
-        ValueFromArgumentResult valueResult = OtherUtils.getValueFromArgument(args,3);
-        if(valueResult == null){
-            msgManager.sendMessage(sender,config.getString("messages.commandListRemoveValueError"),true);
+        ValueFromArgumentResult valueResult = OtherUtils.getValueFromArgument(args, 3);
+        if (valueResult == null) {
+            msgManager.sendMessage(sender, config.getString("messages.commandListRemoveValueError"), true);
             return;
         }
         String value = valueResult.getFinalValue();
@@ -181,236 +182,241 @@ private void removevalue(CommandSender sender, String[] args, FileConfiguration
 
         String playerName = null;
         StringVariableResult result;
-        if(args.length >= 5+valueExtraArgs && !args[4+valueExtraArgs].equals("silent:true")) {
+        if (args.length >= 5 + valueExtraArgs && !args[4 + valueExtraArgs].equals("silent:true")) {
             playerName = args[4 + valueExtraArgs];
         }
 
-        result = plugin.getVariablesManager().getListVariablesManager().removeListVariableValue(playerName,variableName,value);
+        result = plugin.getVariablesManager().getListVariablesManager().removeListVariableValue(playerName, variableName, value);
 
-        boolean silent = args[args.length-1].equals("silent:true");
+        boolean silent = args[args.length - 1].equals("silent:true");
 
-        if(result.isError()){
-            msgManager.sendMessage(sender,result.getErrorMessage(),true);
-        }else{
-            if(silent){
+        if (result.isError()) {
+            msgManager.sendMessage(sender, result.getErrorMessage(), true);
+        } else {
+            if (silent) {
                 return;
             }
-            if(playerName != null){
-                msgManager.sendMessage(sender,config.getString("messages.commandListRemoveValueCorrectPlayer").replace("%variable%",variableName)
-                        .replace("%player%",playerName)
-                        .replace("%value%",value),true);
-            }else{
-                msgManager.sendMessage(sender,config.getString("messages.commandListRemoveValueCorrect").replace("%variable%",variableName)
-                        .replace("%value%",value),true);
+            if (playerName != null) {
+                msgManager.sendMessage(sender, config.getString("messages.commandListRemoveValueCorrectPlayer").replace("%variable%", variableName)
+                        .replace("%player%", playerName)
+                        .replace("%value%", value), true);
+            } else {
+                msgManager.sendMessage(sender, config.getString("messages.commandListRemoveValueCorrect").replace("%variable%", variableName)
+                        .replace("%value%", value), true);
             }
         }
     }
 
-    private void removeindex(CommandSender sender, String[] args, FileConfiguration config, MessagesManager msgManager){
+    private void removeindex(CommandSender sender, String[] args, FileConfiguration config, MessagesManager msgManager) {
         // Remove value from list
         //servervariables list removeindex <variable> <index>
         //servervariables list removeindex <variable> <index> <player>
 
-        if(args.length <= 3){
-            msgManager.sendMessage(sender,config.getString("messages.commandListRemoveIndexError"),true);
+        if (args.length <= 3) {
+            msgManager.sendMessage(sender, config.getString("messages.commandListRemoveIndexError"), true);
             return;
         }
 
         String variableName = args[2];
-        int index = getIndex(args[3],sender,msgManager,config);
-        if(index == -1){
+        int index = getIndex(args[3], sender, msgManager, config);
+        if (index == -1) {
             return;
         }
         String playerName = null;
 
-        if(args.length >= 5 && !args[4].equals("silent:true")){
+        if (args.length >= 5 && !args[4].equals("silent:true")) {
             playerName = args[4];
         }
-        StringVariableResult result = plugin.getVariablesManager().getListVariablesManager().removeListVariableIndex(playerName,variableName,index);
+        StringVariableResult result = plugin.getVariablesManager().getListVariablesManager().removeListVariableIndex(playerName, variableName, index);
 
-        boolean silent = args[args.length-1].equals("silent:true");
+        boolean silent = args[args.length - 1].equals("silent:true");
 
-        if(result.isError()){
-            msgManager.sendMessage(sender,result.getErrorMessage(),true);
-        }else{
-            if(silent){
+        if (result.isError()) {
+            msgManager.sendMessage(sender, result.getErrorMessage(), true);
+        } else {
+            if (silent) {
                 return;
             }
-            if(playerName != null){
-                msgManager.sendMessage(sender,config.getString("messages.commandListRemoveIndexCorrectPlayer").replace("%variable%",variableName)
-                        .replace("%player%",playerName)
-                        .replace("%index%",index+""),true);
-            }else{
-                msgManager.sendMessage(sender,config.getString("messages.commandListRemoveIndexCorrect").replace("%variable%",variableName)
-                        .replace("%index%",index+""),true);
+            if (playerName != null) {
+                msgManager.sendMessage(sender, config.getString("messages.commandListRemoveIndexCorrectPlayer").replace("%variable%", variableName)
+                        .replace("%player%", playerName)
+                        .replace("%index%", index + ""), true);
+            } else {
+                msgManager.sendMessage(sender, config.getString("messages.commandListRemoveIndexCorrect").replace("%variable%", variableName)
+                        .replace("%index%", index + ""), true);
             }
         }
     }
 
-    private void reset(CommandSender sender, String[] args, FileConfiguration config, MessagesManager msgManager){
+    private void reset(CommandSender sender, String[] args, FileConfiguration config, MessagesManager msgManager) {
         //servervariables list reset <variable>
         //servervariables list reset <variable> <player>
 
-        if(args.length <= 2){
-            msgManager.sendMessage(sender,config.getString("messages.commandListResetError"),true);
+        if (args.length <= 2) {
+            msgManager.sendMessage(sender, config.getString("messages.commandListResetError"), true);
             return;
         }
 
         String variableName = args[2];
         String playerName = null;
-        if(args.length >= 4 && !args[3].equals("silent:true")) {
+        if (args.length >= 4 && !args[3].equals("silent:true")) {
             playerName = args[3];
         }
-        StringVariableResult result = plugin.getVariablesManager().resetVariable(playerName,variableName,playerName != null && playerName.equals("*"));
+        StringVariableResult result = plugin.getVariablesManager().resetVariable(playerName, variableName, playerName != null && playerName.equals("*"));
 
-        boolean silent = args[args.length-1].equals("silent:true");
+        boolean silent = args[args.length - 1].equals("silent:true");
 
-        if(result.isError()){
-            msgManager.sendMessage(sender,result.getErrorMessage(),true);
-        }else{
-            if(silent){
+        if (result.isError()) {
+            msgManager.sendMessage(sender, result.getErrorMessage(), true);
+        } else {
+            if (silent) {
                 return;
             }
-            if(playerName != null){
-                if(playerName.equals("*")){
-                    msgManager.sendMessage(sender,config.getString("messages.commandResetCorrectAll").replace("%variable%",variableName),true);
-                }else{
-                    msgManager.sendMessage(sender,config.getString("messages.commandResetCorrectPlayer").replace("%variable%",variableName)
-                            .replace("%player%",playerName),true);
+            if (playerName != null) {
+                if (playerName.equals("*")) {
+                    msgManager.sendMessage(sender, config.getString("messages.commandResetCorrectAll").replace("%variable%", variableName), true);
+                } else {
+                    msgManager.sendMessage(sender, config.getString("messages.commandResetCorrectPlayer").replace("%variable%", variableName)
+                            .replace("%player%", playerName), true);
                 }
-            }else{
-                msgManager.sendMessage(sender,config.getString("messages.commandResetCorrect").replace("%variable%",variableName),true);
+            } else {
+                msgManager.sendMessage(sender, config.getString("messages.commandResetCorrect").replace("%variable%", variableName), true);
             }
         }
     }
 
-    private void display(CommandSender sender, String[] args, FileConfiguration config, MessagesManager msgManager){
+    private void display(CommandSender sender, String[] args, FileConfiguration config, MessagesManager msgManager) {
         // Displays the full list
         //servervariables list display <variable>
         //servervariables list display <variable> <player>
 
-        if(args.length <= 2){
-            msgManager.sendMessage(sender,config.getString("messages.commandListDisplayError"),true);
+        if (args.length <= 2) {
+            msgManager.sendMessage(sender, config.getString("messages.commandListDisplayError"), true);
             return;
         }
 
         String variableName = args[2];
         String playerName = null;
 
-        if(args.length >= 4){
+        if (args.length >= 4) {
             playerName = args[3];
         }
-        ListVariableResult result = plugin.getVariablesManager().getListVariablesManager().getListVariableValue(playerName,variableName,false);
+        ListVariableResult result = plugin.getVariablesManager().getListVariablesManager().getListVariableValue(playerName, variableName, false);
 
         List<String> list = result.getResultValue();
 
-        if(result.isError()){
-            msgManager.sendMessage(sender,result.getErrorMessage(),true);
-        }else{
+        if (result.isError()) {
+            msgManager.sendMessage(sender, result.getErrorMessage(), true);
+        } else {
             StringBuilder sb = new StringBuilder("&7[");
             for (int i = 0; i < list.size(); i++) {
                 if (i > 0) sb.append(", ");
                 sb.append("&e").append(i).append(":&7").append(list.get(i));
             }
             sb.append("]");
-            if(playerName != null){
-                msgManager.sendMessage(sender,config.getString("messages.commandListDisplayCorrectPlayer").replace("%variable%",variableName)
-                        .replace("%values%",sb.toString()).replace("%player%",playerName),true);
-            }else{
-                msgManager.sendMessage(sender,config.getString("messages.commandListDisplayCorrect").replace("%variable%",variableName)
-                        .replace("%values%",sb.toString()),true);
+            if (playerName != null) {
+                msgManager.sendMessage(sender, config.getString("messages.commandListDisplayCorrectPlayer").replace("%variable%", variableName)
+                        .replace("%values%", sb.toString()).replace("%player%", playerName), true);
+            } else {
+                msgManager.sendMessage(sender, config.getString("messages.commandListDisplayCorrect").replace("%variable%", variableName)
+                        .replace("%values%", sb.toString()), true);
             }
         }
     }
 
-    private int getIndex(String arg,CommandSender sender,MessagesManager msgManager,FileConfiguration config){
+    private int getIndex(String arg, CommandSender sender, MessagesManager msgManager, FileConfiguration config) {
         int index;
-        try{
+        try {
             index = Integer.parseInt(arg);
-            if(index < 0){
-                msgManager.sendMessage(sender,config.getString("messages.commandListInvalidIndex"),true);
+            if (index < 0) {
+                msgManager.sendMessage(sender, config.getString("messages.commandListInvalidIndex"), true);
                 return -1;
             }
-        }catch(NumberFormatException e){
-            msgManager.sendMessage(sender,config.getString("messages.commandListInvalidIndex"),true);
+        } catch (NumberFormatException e) {
+            msgManager.sendMessage(sender, config.getString("messages.commandListInvalidIndex"), true);
             return -1;
         }
         return index;
     }
 
     private void sendMessageSet(CommandSender sender, StringVariableResult result, MessagesManager msgManager, FileConfiguration config,
-                                String variableName, String playerName, int index, boolean silent){
+                                String variableName, String playerName, int index, boolean silent) {
         boolean silentCommandsHideErrors = plugin.getConfigsManager().getMainConfigManager().isSilentCommandsHideErrors();
-        if(result.isError()){
-            if(silent && silentCommandsHideErrors){
+        if (result.isError()) {
+            if (silent && silentCommandsHideErrors) {
                 return;
             }
-            msgManager.sendMessage(sender,result.getErrorMessage(),true);
-        }else{
-            if(silent){
+            msgManager.sendMessage(sender, result.getErrorMessage(), true);
+        } else {
+            if (silent) {
                 return;
             }
-            if(playerName != null){
-                msgManager.sendMessage(sender,config.getString("messages.commandListSetCorrectPlayer").replace("%variable%",variableName)
-                        .replace("%value%",result.getResultValue()).replace("%player%",playerName)
-                        .replace("%index%",index+""),true);
-            }else{
-                msgManager.sendMessage(sender,config.getString("messages.commandListSetCorrect").replace("%variable%",variableName)
-                        .replace("%value%",result.getResultValue()).replace("%index%",index+""),true);
+            if (playerName != null) {
+                msgManager.sendMessage(sender, config.getString("messages.commandListSetCorrectPlayer").replace("%variable%", variableName)
+                        .replace("%value%", result.getResultValue()).replace("%player%", playerName)
+                        .replace("%index%", index + ""), true);
+            } else {
+                msgManager.sendMessage(sender, config.getString("messages.commandListSetCorrect").replace("%variable%", variableName)
+                        .replace("%value%", result.getResultValue()).replace("%index%", index + ""), true);
             }
         }
     }
 
-    public List<String> onTabComplete(CommandSender sender, String[] args, Map<String,Variable> variables) {
+    public List<String> onTabComplete(String[] args, Map<String, Variable> variables) {
         // args length is at least 2
         List<String> completions = new ArrayList<>();
         List<String> commands = new ArrayList<>();
-        commands.add("get");commands.add("set");commands.add("add");commands.add("removevalue");commands.add("removeindex");
-        commands.add("display");commands.add("reset");
-        if(args.length == 2){
-            for(String c : commands) {
-                if(args[1].isEmpty() || c.startsWith(args[1].toLowerCase())) {
+        commands.add("get");
+        commands.add("set");
+        commands.add("add");
+        commands.add("removevalue");
+        commands.add("removeindex");
+        commands.add("display");
+        commands.add("reset");
+        if (args.length == 2) {
+            for (String c : commands) {
+                if (args[1].isEmpty() || c.startsWith(args[1].toLowerCase())) {
                     completions.add(c);
                 }
             }
             return completions;
-        }else{
-            if(commands.contains(args[1].toLowerCase())){
-                if(args.length == 3){
+        } else {
+            if (commands.contains(args[1].toLowerCase())) {
+                if (args.length == 3) {
                     String argVariable = args[2];
-                    for(Map.Entry<String, Variable> entry : variables.entrySet()) {
+                    for (Map.Entry<String, Variable> entry : variables.entrySet()) {
                         Variable variable = entry.getValue();
-                        if(!variable.getValueType().equals(ValueType.LIST)){
+                        if (!variable.getValueType().equals(ValueType.LIST)) {
                             continue;
                         }
-                        if(argVariable.isEmpty() || variable.getName().toLowerCase().startsWith(argVariable.toLowerCase())) {
+                        if (argVariable.isEmpty() || variable.getName().toLowerCase().startsWith(argVariable.toLowerCase())) {
                             completions.add(variable.getName());
                         }
                     }
                     return completions;
-                }else if(args.length == 4){
-                    if(args[1].equalsIgnoreCase("add")){
-                        addVariablePossibleValuesCompletions(completions,args,3);
+                } else if (args.length == 4) {
+                    if (args[1].equalsIgnoreCase("add")) {
+                        addVariablePossibleValuesCompletions(completions, args, 3);
                         return completions;
-                    }else if(args[1].equalsIgnoreCase("set") || args[1].equalsIgnoreCase("get") ||
-                            args[1].equalsIgnoreCase("removeindex")){
+                    } else if (args[1].equalsIgnoreCase("set") || args[1].equalsIgnoreCase("get") ||
+                            args[1].equalsIgnoreCase("removeindex")) {
                         completions.add("<index>");
                         return completions;
-                    }else if(args[1].equalsIgnoreCase("removevalue")){
+                    } else if (args[1].equalsIgnoreCase("removevalue")) {
                         completions.add("<value>");
                         return completions;
-                    }else if(args[1].equalsIgnoreCase("reset")) {
-                        for(Player p : Bukkit.getOnlinePlayers()) {
-                            if(args[3].isEmpty() || p.getName().startsWith(args[3].toLowerCase())){
+                    } else if (args[1].equalsIgnoreCase("reset")) {
+                        for (Player p : Bukkit.getOnlinePlayers()) {
+                            if (args[3].isEmpty() || p.getName().startsWith(args[3].toLowerCase())) {
                                 completions.add(p.getName());
                             }
                         }
-                        addAllWord(completions,args[3]);
+                        addAllWord(completions, args[3]);
                         return completions;
                     }
-                }else if(args.length == 5){
-                    if(args[1].equalsIgnoreCase("set")){
-                        addVariablePossibleValuesCompletions(completions,args,4);
+                } else if (args.length == 5) {
+                    if (args[1].equalsIgnoreCase("set")) {
+                        addVariablePossibleValuesCompletions(completions, args, 4);
                         return completions;
                     }
                 }
@@ -419,13 +425,13 @@ public List<String> onTabComplete(CommandSender sender, String[] args, Map<Strin
         return null;
     }
 
-    private void addVariablePossibleValuesCompletions(List<String> completions,String[] args,int argVariableIndex){
+    private void addVariablePossibleValuesCompletions(List<String> completions, String[] args, int argVariableIndex) {
         Variable variable = plugin.getVariablesManager().getVariable(args[2]);
         String argVariable = args[argVariableIndex];
-        if(variable != null){
+        if (variable != null) {
             List<String> possibleRealValues = variable.getPossibleRealValues();
-            for(String possibleValue : possibleRealValues){
-                if(argVariable.isEmpty() || possibleValue.toLowerCase().startsWith(argVariable.toLowerCase())) {
+            for (String possibleValue : possibleRealValues) {
+                if (argVariable.isEmpty() || possibleValue.toLowerCase().startsWith(argVariable.toLowerCase())) {
                     completions.add(possibleValue);
                 }
             }
@@ -433,8 +439,8 @@ private void addVariablePossibleValuesCompletions(List<String> completions,Strin
         completions.add("<value>");
     }
 
-    private void addAllWord(List<String> completions,String arg){
-        if(arg.isEmpty() || "*".startsWith(arg.toLowerCase())) {
+    private void addAllWord(List<String> completions, String arg) {
+        if (arg.isEmpty() || "*".startsWith(arg.toLowerCase())) {
             completions.add("*");
         }
     }
diff --git a/src/main/java/svar/ajneb97/config/ConfigsManager.java b/src/main/java/svar/ajneb97/config/ConfigsManager.java
index 8e3f2ca..a9de366 100644
--- a/src/main/java/svar/ajneb97/config/ConfigsManager.java
+++ b/src/main/java/svar/ajneb97/config/ConfigsManager.java
@@ -10,116 +10,109 @@
 import java.util.List;
 import java.util.Map;
 
+@SuppressWarnings("DataFlowIssue")
 public class ConfigsManager {
 
-	private PlayersConfigsManager playerConfigsManager;
-	private DataConfigManager dataConfigManager;
-	private MainConfigManager mainConfigManager;
-	private VariablesFolderConfigManager variablesFolderConfigManager;
-	private ServerVariables plugin;
-	
-	public ConfigsManager(ServerVariables plugin) {
-		this.plugin = plugin;
-		this.mainConfigManager = new MainConfigManager(plugin);
-		this.playerConfigsManager = new PlayersConfigsManager(plugin,"players");
-		this.dataConfigManager = new DataConfigManager(plugin);
-		this.variablesFolderConfigManager = new VariablesFolderConfigManager(plugin,"variables");
-	}
-	
-	public void configure() {
-		this.mainConfigManager.configure();
-		this.playerConfigsManager.configure();
-		this.variablesFolderConfigManager.configure();
-		configureVariables();
-		this.dataConfigManager.configure();
-	}
-
-	public void configureVariables(){
-		Map<String,Variable> variables = new HashMap<>();
-		ArrayList<CommonConfig> variablesConfigs = getVariablesConfigs();
-
-		for(CommonConfig customConfig : variablesConfigs){
-			FileConfiguration config = customConfig.getConfig();
-			if(config.contains("variables")){
-				for(String key : config.getConfigurationSection("variables").getKeys(false)){
-					String path = "variables."+key;
-					VariableType variableType = VariableType.valueOf(config.getString(path+".variable_type"));
-					ValueType valueType = ValueType.valueOf(config.getString(path+".value_type"));
-
-					List<String> possibleValues = new ArrayList<String>();
-					if(config.contains(path+".possible_values")){
-						possibleValues = config.getStringList(path+".possible_values");
-					}
-					Limitations limitations = new Limitations();
-					if(config.contains(path+".limitations.min_value")){
-						limitations.setMinValue(config.getDouble(path+".limitations.min_value"));
-					}
-					if(config.contains(path+".limitations.max_value")){
-						limitations.setMaxValue(config.getDouble(path+".limitations.max_value"));
-					}
-					if(config.contains(path+".limitations.max_characters")){
-						limitations.setMaxCharacters(config.getInt(path+".limitations.max_characters"));
-					}
-					if(config.contains(path+".limitations.max_decimals")){
-						limitations.setMaxDecimals(config.getInt(path+".limitations.max_decimals"));
-					}
-					if(config.contains(path+".limitations.manage_out_of_range")){
-						limitations.setManageOutOfRange(config.getBoolean(path+".limitations.manage_out_of_range"));
-					}
-
-					if(valueType.equals(ValueType.LIST)){
-						variables.put(key,new ListVariable(key, variableType, valueType, possibleValues, limitations,
-								config.getStringList(path+".initial_value")));
-					}else{
-						variables.put(key,new StringVariable(key, variableType, valueType, possibleValues, limitations,
-								config.getString(path+".initial_value")));
-					}
-				}
-			}
-		}
-		plugin.getVariablesManager().setVariables(variables);
-	}
-
-	public PlayersConfigsManager getPlayerConfigsManager() {
-		return playerConfigsManager;
-	}
-
-	public DataConfigManager getDataConfigManager() {
-		return dataConfigManager;
-	}
-
-	public MainConfigManager getMainConfigManager() {
-		return mainConfigManager;
-	}
-
-	private ArrayList<CommonConfig> getVariablesConfigs() {
-		ArrayList<CommonConfig> configs = new ArrayList<>();
-
-		configs.add(mainConfigManager.getConfigFile());
-		configs.addAll(variablesFolderConfigManager.getConfigs());
-
-		return configs;
-	}
-
-	public boolean reloadConfigs(){
-		if(!mainConfigManager.reloadConfig()){
-			return false;
-		}
-
-		configureVariables();
-
-		saveServerData();
-		savePlayerData();
-		return true;
-	}
-
-	public void savePlayerData(){
-		if(plugin.getMySQLConnection() == null){
-			playerConfigsManager.saveConfigs();
-		}
-	}
-
-	public void saveServerData(){
-		dataConfigManager.saveData();
-	}
+    private final PlayersConfigsManager playerConfigsManager;
+    private final DataConfigManager dataConfigManager;
+    private final MainConfigManager mainConfigManager;
+    private final VariablesFolderConfigManager variablesFolderConfigManager;
+    private final ServerVariables plugin;
+
+    public ConfigsManager(ServerVariables plugin) {
+        this.plugin = plugin;
+        this.mainConfigManager = new MainConfigManager(plugin);
+        this.playerConfigsManager = new PlayersConfigsManager(plugin, "players");
+        this.dataConfigManager = new DataConfigManager(plugin);
+        this.variablesFolderConfigManager = new VariablesFolderConfigManager(plugin, "variables");
+    }
+
+    public void configure() {
+        this.mainConfigManager.configure();
+        this.playerConfigsManager.configure();
+        this.variablesFolderConfigManager.configure();
+        configureVariables();
+        this.dataConfigManager.configure();
+    }
+
+    public void configureVariables() {
+        Map<String, Variable> variables = new HashMap<>();
+        ArrayList<CommonConfig> variablesConfigs = getVariablesConfigs();
+
+        for (CommonConfig customConfig : variablesConfigs) {
+            FileConfiguration config = customConfig.getConfig();
+            if (config.contains("variables")) {
+                for (String key : config.getConfigurationSection("variables").getKeys(false)) {
+                    String path = "variables." + key;
+                    VariableType variableType = VariableType.valueOf(config.getString(path + ".variable_type"));
+                    ValueType valueType = ValueType.valueOf(config.getString(path + ".value_type"));
+
+                    List<String> possibleValues = new ArrayList<>();
+                    if (config.contains(path + ".possible_values")) {
+                        possibleValues = config.getStringList(path + ".possible_values");
+                    }
+                    Limitations limitations = new Limitations();
+                    if (config.contains(path + ".limitations.min_value")) {
+                        limitations.setMinValue(config.getDouble(path + ".limitations.min_value"));
+                    }
+                    if (config.contains(path + ".limitations.max_value")) {
+                        limitations.setMaxValue(config.getDouble(path + ".limitations.max_value"));
+                    }
+                    if (config.contains(path + ".limitations.max_characters")) {
+                        limitations.setMaxCharacters(config.getInt(path + ".limitations.max_characters"));
+                    }
+                    if (config.contains(path + ".limitations.max_decimals")) {
+                        limitations.setMaxDecimals(config.getInt(path + ".limitations.max_decimals"));
+                    }
+                    if (config.contains(path + ".limitations.manage_out_of_range")) {
+                        limitations.setManageOutOfRange(config.getBoolean(path + ".limitations.manage_out_of_range"));
+                    }
+
+                    if (valueType.equals(ValueType.LIST)) {
+                        variables.put(key, new ListVariable(key, variableType, valueType, possibleValues, limitations,
+                                config.getStringList(path + ".initial_value")));
+                    } else {
+                        variables.put(key, new StringVariable(key, variableType, valueType, possibleValues, limitations,
+                                config.getString(path + ".initial_value")));
+                    }
+                }
+            }
+        }
+        plugin.getVariablesManager().setVariables(variables);
+    }
+
+    public MainConfigManager getMainConfigManager() {
+        return mainConfigManager;
+    }
+
+    private ArrayList<CommonConfig> getVariablesConfigs() {
+        ArrayList<CommonConfig> configs = new ArrayList<>();
+
+        configs.add(mainConfigManager.getConfigFile());
+        configs.addAll(variablesFolderConfigManager.getConfigs());
+
+        return configs;
+    }
+
+    public boolean reloadConfigs() {
+        if (!mainConfigManager.reloadConfig()) {
+            return false;
+        }
+
+        configureVariables();
+
+        saveServerData();
+        savePlayerData();
+        return true;
+    }
+
+    public void savePlayerData() {
+        if (plugin.getMySQLConnection() == null) {
+            playerConfigsManager.saveConfigs();
+        }
+    }
+
+    public void saveServerData() {
+        dataConfigManager.saveData();
+    }
 }
diff --git a/src/main/java/svar/ajneb97/config/DataConfigManager.java b/src/main/java/svar/ajneb97/config/DataConfigManager.java
index dbdb15d..97b8801 100644
--- a/src/main/java/svar/ajneb97/config/DataConfigManager.java
+++ b/src/main/java/svar/ajneb97/config/DataConfigManager.java
@@ -1,6 +1,5 @@
 package svar.ajneb97.config;
 
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -12,43 +11,44 @@
 import svar.ajneb97.model.ServerVariablesStringVariable;
 import svar.ajneb97.model.ServerVariablesVariable;
 
+@SuppressWarnings("DataFlowIssue")
 public class DataConfigManager {
 
-	private ServerVariables plugin;
-	private CommonConfig configFile;
-	
-	public DataConfigManager(ServerVariables plugin) {
-		this.plugin = plugin;
-		this.configFile = new CommonConfig("data.yml",plugin,null,false);
-		configFile.registerConfig();
-	}
-	
-	public void configure() {
-		ServerVariablesManager serverVariablesManager = plugin.getServerVariablesManager();
-		FileConfiguration dataFile = configFile.getConfig();
-
-		Map<String,ServerVariablesVariable> variables = new HashMap<>();
-		if(dataFile.contains("variables")) {
-			for(String key : dataFile.getConfigurationSection("variables").getKeys(false)){
-				if(dataFile.isList("variables."+key)){
-					variables.put(key,new ServerVariablesListVariable(key, dataFile.getStringList("variables." + key)));
-				}else{
-					variables.put(key,new ServerVariablesStringVariable(key, dataFile.getString("variables." + key)));
-				}
-			}
-		}
-		serverVariablesManager.setVariables(variables);
-	}
-
-	public void saveData(){
-		ServerVariablesManager serverVariablesManager = plugin.getServerVariablesManager();
-		Map<String,ServerVariablesVariable> variables = serverVariablesManager.getVariables();
-		FileConfiguration dataFile = configFile.getConfig();
-		dataFile.set("variables", null);
-		for(Map.Entry<String, ServerVariablesVariable> entry : variables.entrySet()){
-			String variableName = entry.getKey();
-			dataFile.set("variables."+variableName,entry.getValue().getCurrentValue()); // String or List<String>
-		}
-		configFile.saveConfig();
-	}
+    private final ServerVariables plugin;
+    private final CommonConfig configFile;
+
+    public DataConfigManager(ServerVariables plugin) {
+        this.plugin = plugin;
+        this.configFile = new CommonConfig("data.yml", plugin, null, false);
+        configFile.registerConfig();
+    }
+
+    public void configure() {
+        ServerVariablesManager serverVariablesManager = plugin.getServerVariablesManager();
+        FileConfiguration dataFile = configFile.getConfig();
+
+        Map<String, ServerVariablesVariable> variables = new HashMap<>();
+        if (dataFile.contains("variables")) {
+            for (String key : dataFile.getConfigurationSection("variables").getKeys(false)) {
+                if (dataFile.isList("variables." + key)) {
+                    variables.put(key, new ServerVariablesListVariable(key, dataFile.getStringList("variables." + key)));
+                } else {
+                    variables.put(key, new ServerVariablesStringVariable(key, dataFile.getString("variables." + key)));
+                }
+            }
+        }
+        serverVariablesManager.setVariables(variables);
+    }
+
+    public void saveData() {
+        ServerVariablesManager serverVariablesManager = plugin.getServerVariablesManager();
+        Map<String, ServerVariablesVariable> variables = serverVariablesManager.getVariables();
+        FileConfiguration dataFile = configFile.getConfig();
+        dataFile.set("variables", null);
+        for (Map.Entry<String, ServerVariablesVariable> entry : variables.entrySet()) {
+            String variableName = entry.getKey();
+            dataFile.set("variables." + variableName, entry.getValue().getCurrentValue()); // String or List<String>
+        }
+        configFile.saveConfig();
+    }
 }
diff --git a/src/main/java/svar/ajneb97/config/DataFolderConfigManager.java b/src/main/java/svar/ajneb97/config/DataFolderConfigManager.java
index 0ae9c5b..89e0463 100644
--- a/src/main/java/svar/ajneb97/config/DataFolderConfigManager.java
+++ b/src/main/java/svar/ajneb97/config/DataFolderConfigManager.java
@@ -7,11 +7,13 @@
 import java.io.File;
 import java.util.ArrayList;
 
+@SuppressWarnings("ResultOfMethodCallIgnored")
 public abstract class DataFolderConfigManager {
+
     protected String folderName;
     protected ServerVariables plugin;
 
-    public DataFolderConfigManager(ServerVariables plugin, String folderName){
+    public DataFolderConfigManager(ServerVariables plugin, String folderName) {
         this.plugin = plugin;
         this.folderName = folderName;
     }
@@ -21,16 +23,15 @@ public void configure() {
         loadConfigs();
     }
 
-    public void createFolder(){
+    public void createFolder() {
         File folder;
         try {
             folder = new File(plugin.getDataFolder() + File.separator + folderName);
-            if(!folder.exists()){
+            if (!folder.exists()) {
                 folder.mkdirs();
                 createFiles();
             }
-        } catch(SecurityException e) {
-            folder = null;
+        } catch (SecurityException ignored) {
         }
     }
 
@@ -40,12 +41,17 @@ public CommonConfig getConfigFile(String pathName) {
         return commonConfig;
     }
 
-    public ArrayList<CommonConfig> getConfigs(){
+    public ArrayList<CommonConfig> getConfigs() {
         ArrayList<CommonConfig> configs = new ArrayList<>();
 
         String pathFile = plugin.getDataFolder() + File.separator + folderName;
         File folder = new File(pathFile);
         File[] listOfFiles = folder.listFiles();
+
+        if (listOfFiles == null) {
+            return configs;
+        }
+
         for (File file : listOfFiles) {
             if (file.isFile()) {
                 String pathName = file.getName();
diff --git a/src/main/java/svar/ajneb97/config/MainConfigManager.java b/src/main/java/svar/ajneb97/config/MainConfigManager.java
index 46e38e8..a6c1362 100644
--- a/src/main/java/svar/ajneb97/config/MainConfigManager.java
+++ b/src/main/java/svar/ajneb97/config/MainConfigManager.java
@@ -10,152 +10,153 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.logging.Level;
 
 public class MainConfigManager {
 
-	private ServerVariables plugin;
-	private CommonConfig configFile;
-
-	private boolean updateNotify;
-	private boolean isMySQL;
-	private boolean silentCommandsHideErrors;
-	private boolean useMiniMessage;
-
-	public MainConfigManager(ServerVariables plugin) {
-		this.plugin = plugin;
-		this.configFile = new CommonConfig("config.yml",plugin,null,false);
-		configFile.registerConfig();
-		checkMessagesUpdate();
-	}
-	
-	public void configure() {
-		FileConfiguration config = configFile.getConfig();
-
-		plugin.setMessagesManager(new MessagesManager(config.getString("messages.prefix")));
-
-		DataSaveTask dataSaveTask = plugin.getDataSaveTask();
-		if(dataSaveTask != null) {
-			dataSaveTask.end();
-		}
-		dataSaveTask = new DataSaveTask(plugin);
-		dataSaveTask.start(config.getInt("config.data_save_time"));
-
-		updateNotify = config.getBoolean("update_notify");
-		isMySQL = config.getBoolean("config.mysql_database.enabled");
-		silentCommandsHideErrors = config.getBoolean("config.silent_commands_hide_errors");
-		useMiniMessage = config.getBoolean("config.use_minimessage");
-	}
-
-	public boolean reloadConfig(){
-		if(!configFile.reloadConfig()){
-			return false;
-		}
-		configure();
-		return true;
-	}
-
-	public CommonConfig getConfigFile() {
-		return configFile;
-	}
-
-	public boolean isMySQL(){
-		return isMySQL;
-	}
-
-	public boolean isUpdateNotify() {
-		return updateNotify;
-	}
-
-	public FileConfiguration getConfig(){
-		return configFile.getConfig();
-	}
-
-	public void saveConfig(){
-		configFile.saveConfig();
-	}
-
-	public void checkMessagesUpdate(){
-		Path pathConfig = Paths.get(configFile.getRoute());
-		try{
-			String text = new String(Files.readAllBytes(pathConfig));
-			FileConfiguration config = getConfig();
-			if(!text.contains("use_minimessage:")){
-				config.set("config.use_minimessage",false);
-				saveConfig();
-			}
-			if(!text.contains("commandListError:")){
-				config.set("messages.commandListError", "&cYou need to use: &7/svar list <option>");
-				config.set("messages.commandListGetError", "&cYou need to use: &7/svar list get <variable> <index> (optional)<player>");
-				config.set("messages.commandListSetError", "&cYou need to use: &7/svar list set <variable> <index> <value> (optional)<player> (optional)silent:true");
-				config.set("messages.commandListAddError", "&cYou need to use: &7/svar list add <variable> <value> (optional)<player> (optional)silent:true");
-				config.set("messages.commandListDisplayError", "&cYou need to use: &7/svar list display <variable> (optional)<player>");
-				config.set("messages.commandListResetError", "&cYou need to use: &7/svar list reset <variable> (optional)<player>");
-				config.set("messages.commandListRemoveIndexError", "&cYou need to use: &7/svar list removeindex <variable> <index> (optional)<player>");
-				config.set("messages.commandListRemoveValueError", "&cYou need to use: &7/svar list removevalue <variable> <value> (optional)<player>");
-				config.set("messages.commandListInvalidIndex", "&cYou need to use a valid index.");
-				config.set("messages.variableNotList", "&cThat variable is not a list.");
-				config.set("messages.variableIsList", "&cThat variable is a list. Use &7/svar list <option>");
-				config.set("messages.variableListIndexError", "&cThat list doesn't have the index &7%index%&c.");
-				config.set("messages.variableListValueError", "&cThat list doesn't have the value &7%value%&c.");
-				config.set("messages.commandListGetCorrect", "&aVariable &7%variable% &acurrent value at index &7%index% &ais: &7%value%&a.");
-				config.set("messages.commandListGetCorrectPlayer", "&aVariable &7%variable% &acurrent value at index &7%index% &afrom player &e%player% &ais: &7%value%&a.");
-				config.set("messages.commandListSetCorrect", "&aVariable &7%variable% &avalue at index &7%index% &aset to &7%value%&a.");
-				config.set("messages.commandListSetCorrectPlayer", "&aVariable &7%variable% &avalue at index &7%index% &aset to &7%value% &afor player &e%player%&a.");
-				config.set("messages.commandListDisplayCorrect", "&aVariable &7%variable% &acurrent values: &7%values%");
-				config.set("messages.commandListDisplayCorrectPlayer", "&aVariable &7%variable% &acurrent values from player &e%player%&a: &7%values%");
-				config.set("messages.commandListRemoveIndexCorrect", "&aVariable &7%variable% &avalue at index &7%index% &aremoved.");
-				config.set("messages.commandListRemoveIndexCorrectPlayer", "&aVariable &7%variable% &avalue at index &7%index% &aremoved for player &e%player%&a.");
-				config.set("messages.commandListRemoveValueCorrect", "&aVariable &7%variable% &avalue &7%value% &aremoved.");
-				config.set("messages.commandListRemoveValueCorrectPlayer", "&aVariable &7%variable% &avalue &7%value% &aremoved for player &e%player%&a.");
-				saveConfig();
-			}
-			if(!text.contains("update_notify:")){
-				getConfig().set("config.update_notify",true);
-				saveConfig();
-			}
-			if(!text.contains("verifyServerCertificate:")){
-				getConfig().set("config.mysql_database.pool.connectionTimeout",5000);
-				getConfig().set("config.mysql_database.advanced.verifyServerCertificate",false);
-				getConfig().set("config.mysql_database.advanced.useSSL",true);
-				getConfig().set("config.mysql_database.advanced.allowPublicKeyRetrieval",true);
-				saveConfig();
-			}
-			if(!text.contains("silent_commands_hide_errors:")){
-				getConfig().set("config.silent_commands_hide_errors",false);
-				saveConfig();
-			}
-			if(!text.contains("commandResetCorrectAll:")){
-				getConfig().set("messages.commandResetCorrectAll","&aVariable &7%variable% &areset for &eall players&a.");
-				saveConfig();
-			}
-			if(!text.contains("variableLimitationMaxCharactersError:")){
-				getConfig().set("messages.variableLimitationMaxCharactersError","&cVariable supports a maximum of &7%value% &ccharacters.");
-				saveConfig();
-			}
-			if(!text.contains("variableLimitationOutOfRangeMax:")){
-				getConfig().set("messages.variableLimitationOutOfRangeMax","&cVariable out of range. Max value is &7%value%");
-				getConfig().set("messages.variableLimitationOutOfRangeMin","&cVariable out of range. Min value is &7%value%");
-				saveConfig();
-			}
-			if(!text.contains("mysql_database:")){
-				getConfig().set("config.mysql_database.enabled", false);
-				getConfig().set("config.mysql_database.host", "localhost");
-				getConfig().set("config.mysql_database.port", 3306);
-				getConfig().set("config.mysql_database.username", "root");
-				getConfig().set("config.mysql_database.password", "root");
-				getConfig().set("config.mysql_database.database", "servervariables");
-				saveConfig();
-			}
-		}catch(IOException e){
-			e.printStackTrace();
-		}
-	}
-
-	public boolean isSilentCommandsHideErrors() {
-		return silentCommandsHideErrors;
-	}
-
-	public boolean isUseMiniMessage() {
-		return useMiniMessage;
-	}
+    private final ServerVariables plugin;
+    private final CommonConfig configFile;
+
+    private boolean updateNotify;
+    private boolean isMySQL;
+    private boolean silentCommandsHideErrors;
+    private boolean useMiniMessage;
+
+    public MainConfigManager(ServerVariables plugin) {
+        this.plugin = plugin;
+        this.configFile = new CommonConfig("config.yml", plugin, null, false);
+        configFile.registerConfig();
+        checkMessagesUpdate();
+    }
+
+    public void configure() {
+        FileConfiguration config = configFile.getConfig();
+
+        plugin.setMessagesManager(new MessagesManager(config.getString("messages.prefix")));
+
+        DataSaveTask dataSaveTask = plugin.getDataSaveTask();
+        if (dataSaveTask != null) {
+            dataSaveTask.stop();
+        }
+        dataSaveTask = new DataSaveTask(plugin);
+        dataSaveTask.start(config.getInt("config.data_save_time"));
+
+        updateNotify = config.getBoolean("update_notify");
+        isMySQL = config.getBoolean("config.mysql_database.enabled");
+        silentCommandsHideErrors = config.getBoolean("config.silent_commands_hide_errors");
+        useMiniMessage = config.getBoolean("config.use_minimessage");
+    }
+
+    public boolean reloadConfig() {
+        if (!configFile.reloadConfig()) {
+            return false;
+        }
+        configure();
+        return true;
+    }
+
+    public CommonConfig getConfigFile() {
+        return configFile;
+    }
+
+    public boolean isMySQL() {
+        return isMySQL;
+    }
+
+    public boolean isUpdateNotify() {
+        return updateNotify;
+    }
+
+    public FileConfiguration getConfig() {
+        return configFile.getConfig();
+    }
+
+    public void saveConfig() {
+        configFile.saveConfig();
+    }
+
+    public void checkMessagesUpdate() {
+        Path pathConfig = Paths.get(configFile.getRoute());
+        try {
+            String text = new String(Files.readAllBytes(pathConfig));
+            FileConfiguration config = getConfig();
+            if (!text.contains("use_minimessage:")) {
+                config.set("config.use_minimessage", false);
+                saveConfig();
+            }
+            if (!text.contains("commandListError:")) {
+                config.set("messages.commandListError", "&cYou need to use: &7/svar list <option>");
+                config.set("messages.commandListGetError", "&cYou need to use: &7/svar list get <variable> <index> (optional)<player>");
+                config.set("messages.commandListSetError", "&cYou need to use: &7/svar list set <variable> <index> <value> (optional)<player> (optional)silent:true");
+                config.set("messages.commandListAddError", "&cYou need to use: &7/svar list add <variable> <value> (optional)<player> (optional)silent:true");
+                config.set("messages.commandListDisplayError", "&cYou need to use: &7/svar list display <variable> (optional)<player>");
+                config.set("messages.commandListResetError", "&cYou need to use: &7/svar list reset <variable> (optional)<player>");
+                config.set("messages.commandListRemoveIndexError", "&cYou need to use: &7/svar list removeindex <variable> <index> (optional)<player>");
+                config.set("messages.commandListRemoveValueError", "&cYou need to use: &7/svar list removevalue <variable> <value> (optional)<player>");
+                config.set("messages.commandListInvalidIndex", "&cYou need to use a valid index.");
+                config.set("messages.variableNotList", "&cThat variable is not a list.");
+                config.set("messages.variableIsList", "&cThat variable is a list. Use &7/svar list <option>");
+                config.set("messages.variableListIndexError", "&cThat list doesn't have the index &7%index%&c.");
+                config.set("messages.variableListValueError", "&cThat list doesn't have the value &7%value%&c.");
+                config.set("messages.commandListGetCorrect", "&aVariable &7%variable% &acurrent value at index &7%index% &ais: &7%value%&a.");
+                config.set("messages.commandListGetCorrectPlayer", "&aVariable &7%variable% &acurrent value at index &7%index% &afrom player &e%player% &ais: &7%value%&a.");
+                config.set("messages.commandListSetCorrect", "&aVariable &7%variable% &avalue at index &7%index% &aset to &7%value%&a.");
+                config.set("messages.commandListSetCorrectPlayer", "&aVariable &7%variable% &avalue at index &7%index% &aset to &7%value% &afor player &e%player%&a.");
+                config.set("messages.commandListDisplayCorrect", "&aVariable &7%variable% &acurrent values: &7%values%");
+                config.set("messages.commandListDisplayCorrectPlayer", "&aVariable &7%variable% &acurrent values from player &e%player%&a: &7%values%");
+                config.set("messages.commandListRemoveIndexCorrect", "&aVariable &7%variable% &avalue at index &7%index% &aremoved.");
+                config.set("messages.commandListRemoveIndexCorrectPlayer", "&aVariable &7%variable% &avalue at index &7%index% &aremoved for player &e%player%&a.");
+                config.set("messages.commandListRemoveValueCorrect", "&aVariable &7%variable% &avalue &7%value% &aremoved.");
+                config.set("messages.commandListRemoveValueCorrectPlayer", "&aVariable &7%variable% &avalue &7%value% &aremoved for player &e%player%&a.");
+                saveConfig();
+            }
+            if (!text.contains("update_notify:")) {
+                getConfig().set("config.update_notify", true);
+                saveConfig();
+            }
+            if (!text.contains("verifyServerCertificate:")) {
+                getConfig().set("config.mysql_database.pool.connectionTimeout", 5000);
+                getConfig().set("config.mysql_database.advanced.verifyServerCertificate", false);
+                getConfig().set("config.mysql_database.advanced.useSSL", true);
+                getConfig().set("config.mysql_database.advanced.allowPublicKeyRetrieval", true);
+                saveConfig();
+            }
+            if (!text.contains("silent_commands_hide_errors:")) {
+                getConfig().set("config.silent_commands_hide_errors", false);
+                saveConfig();
+            }
+            if (!text.contains("commandResetCorrectAll:")) {
+                getConfig().set("messages.commandResetCorrectAll", "&aVariable &7%variable% &areset for &eall players&a.");
+                saveConfig();
+            }
+            if (!text.contains("variableLimitationMaxCharactersError:")) {
+                getConfig().set("messages.variableLimitationMaxCharactersError", "&cVariable supports a maximum of &7%value% &ccharacters.");
+                saveConfig();
+            }
+            if (!text.contains("variableLimitationOutOfRangeMax:")) {
+                getConfig().set("messages.variableLimitationOutOfRangeMax", "&cVariable out of range. Max value is &7%value%");
+                getConfig().set("messages.variableLimitationOutOfRangeMin", "&cVariable out of range. Min value is &7%value%");
+                saveConfig();
+            }
+            if (!text.contains("mysql_database:")) {
+                getConfig().set("config.mysql_database.enabled", false);
+                getConfig().set("config.mysql_database.host", "localhost");
+                getConfig().set("config.mysql_database.port", 3306);
+                getConfig().set("config.mysql_database.username", "root");
+                getConfig().set("config.mysql_database.password", "root");
+                getConfig().set("config.mysql_database.database", "servervariables");
+                saveConfig();
+            }
+        } catch (IOException e) {
+            plugin.getLogger().log(Level.WARNING, "Error checking messages update", e);
+        }
+    }
+
+    public boolean isSilentCommandsHideErrors() {
+        return silentCommandsHideErrors;
+    }
+
+    public boolean isUseMiniMessage() {
+        return useMiniMessage;
+    }
 }
diff --git a/src/main/java/svar/ajneb97/config/PlayersConfigsManager.java b/src/main/java/svar/ajneb97/config/PlayersConfigsManager.java
index 6ad24ec..5d97689 100644
--- a/src/main/java/svar/ajneb97/config/PlayersConfigsManager.java
+++ b/src/main/java/svar/ajneb97/config/PlayersConfigsManager.java
@@ -13,71 +13,72 @@
 import svar.ajneb97.model.ServerVariablesStringVariable;
 import svar.ajneb97.model.ServerVariablesVariable;
 
-public class PlayersConfigsManager extends DataFolderConfigManager{
+@SuppressWarnings("DataFlowIssue")
+public class PlayersConfigsManager extends DataFolderConfigManager {
 
-	public PlayersConfigsManager(ServerVariables plugin, String folderName) {
-		super(plugin, folderName);
-	}
+    public PlayersConfigsManager(ServerVariables plugin, String folderName) {
+        super(plugin, folderName);
+    }
 
-	@Override
-	public void createFiles() {
+    @Override
+    public void createFiles() {
+        //
+    }
 
-	}
+    @Override
+    public void loadConfigs() {
+        Map<UUID, ServerVariablesPlayer> players = new HashMap<>();
 
-	@Override
-	public void loadConfigs() {
-		Map<UUID,ServerVariablesPlayer> players = new HashMap<>();
+        ArrayList<CommonConfig> configs = getConfigs();
+        for (CommonConfig commonConfig : configs) {
+            FileConfiguration playerFile = commonConfig.getConfig();
+            String name = playerFile.getString("name");
+            String uuidString = commonConfig.getPath().replace(".yml", "");
+            Map<String, ServerVariablesVariable> variables = new HashMap<>();
+            if (playerFile.contains("variables")) {
+                for (String key : playerFile.getConfigurationSection("variables").getKeys(false)) {
+                    if (playerFile.isList("variables." + key)) {
+                        variables.put(key, new ServerVariablesListVariable(key, playerFile.getStringList("variables." + key)));
+                    } else {
+                        variables.put(key, new ServerVariablesStringVariable(key, playerFile.getString("variables." + key)));
+                    }
+                }
+            }
 
-		ArrayList<CommonConfig> configs = getConfigs();
-		for(CommonConfig commonConfig : configs){
-			FileConfiguration playerFile = commonConfig.getConfig();
-			String name = playerFile.getString("name");
-			String uuidString = commonConfig.getPath().replace(".yml", "");
-			Map<String,ServerVariablesVariable> variables = new HashMap<>();
-			if (playerFile.contains("variables")) {
-				for (String key : playerFile.getConfigurationSection("variables").getKeys(false)) {
-					if(playerFile.isList("variables."+key)){
-						variables.put(key,new ServerVariablesListVariable(key, playerFile.getStringList("variables." + key)));
-					}else{
-						variables.put(key,new ServerVariablesStringVariable(key, playerFile.getString("variables." + key)));
-					}
-				}
-			}
+            UUID uuid = UUID.fromString(uuidString);
+            ServerVariablesPlayer player = new ServerVariablesPlayer(uuid, name, variables);
+            players.put(uuid, player);
+        }
 
-			UUID uuid = UUID.fromString(uuidString);
-			ServerVariablesPlayer player = new ServerVariablesPlayer(uuid, name, variables);
-			players.put(uuid, player);
-		}
+        plugin.getPlayerVariablesManager().setPlayerVariables(players);
+    }
 
-		plugin.getPlayerVariablesManager().setPlayerVariables(players);
-	}
+    public void savePlayer(ServerVariablesPlayer player) {
+        String playerName = player.getName();
+        CommonConfig playerConfig = getConfigFile(player.getUuid() + ".yml");
+        FileConfiguration playerFile = playerConfig.getConfig();
 
-	public void savePlayer(ServerVariablesPlayer player){
-		String playerName = player.getName();
-		CommonConfig playerConfig = getConfigFile(player.getUuid()+".yml");
-		FileConfiguration playerFile = playerConfig.getConfig();
+        playerFile.set("name", playerName);
+        playerFile.set("variables", null);
+        Map<String, ServerVariablesVariable> variables = player.getVariables();
+        for (Map.Entry<String, ServerVariablesVariable> entry : variables.entrySet()) {
+            playerFile.set("variables." + entry.getKey(), entry.getValue().getCurrentValue()); // String or List<String>
+        }
 
-		playerFile.set("name", playerName);
-		playerFile.set("variables", null);
-		Map<String,ServerVariablesVariable> variables = player.getVariables();
-		for(Map.Entry<String, ServerVariablesVariable> entry : variables.entrySet()){
-			playerFile.set("variables."+entry.getKey(), entry.getValue().getCurrentValue()); // String or List<String>
-		}
+        playerConfig.saveConfig();
+    }
 
-		playerConfig.saveConfig();
-	}
+    @Override
+    public void saveConfigs() {
+        Map<UUID, ServerVariablesPlayer> players = plugin.getPlayerVariablesManager().getPlayerVariables();
 
-	@Override
-	public void saveConfigs() {
-		Map<UUID, ServerVariablesPlayer> players = plugin.getPlayerVariablesManager().getPlayerVariables();
-
-		Map<UUID, ServerVariablesPlayer> playersCopy = new HashMap<>(players);
-		for(Map.Entry<UUID, ServerVariablesPlayer> entry : playersCopy.entrySet()){
-			ServerVariablesPlayer player = entry.getValue();
-			if(player.isModified()){
-				savePlayer(player);
-			}
-			player.setModified(false);
-		}
-	}
+        Map<UUID, ServerVariablesPlayer> playersCopy = new HashMap<>(players);
+        for (Map.Entry<UUID, ServerVariablesPlayer> entry : playersCopy.entrySet()) {
+            ServerVariablesPlayer player = entry.getValue();
+            if (player.isModified()) {
+                savePlayer(player);
+            }
+            player.setModified(false);
+        }
+    }
 }
diff --git a/src/main/java/svar/ajneb97/config/VariablesFolderConfigManager.java b/src/main/java/svar/ajneb97/config/VariablesFolderConfigManager.java
index 977dce6..eed7a74 100644
--- a/src/main/java/svar/ajneb97/config/VariablesFolderConfigManager.java
+++ b/src/main/java/svar/ajneb97/config/VariablesFolderConfigManager.java
@@ -3,12 +3,8 @@
 
 import svar.ajneb97.ServerVariables;
 import svar.ajneb97.config.model.CommonConfig;
-import svar.ajneb97.utils.OtherUtils;
 
-import java.io.File;
-import java.util.ArrayList;
-
-public class VariablesFolderConfigManager extends DataFolderConfigManager{
+public class VariablesFolderConfigManager extends DataFolderConfigManager {
 
     public VariablesFolderConfigManager(ServerVariables plugin, String folderName) {
         super(plugin, folderName);
@@ -16,7 +12,7 @@ public VariablesFolderConfigManager(ServerVariables plugin, String folderName) {
 
     @Override
     public void createFiles() {
-        new CommonConfig("more_variables.yml",plugin,folderName,false).registerConfig();
+        new CommonConfig("more_variables.yml", plugin, folderName, false).registerConfig();
     }
 
     @Override
@@ -28,6 +24,4 @@ public void loadConfigs() {
     public void saveConfigs() {
 
     }
-
-
 }
diff --git a/src/main/java/svar/ajneb97/config/model/CommonConfig.java b/src/main/java/svar/ajneb97/config/model/CommonConfig.java
index 8106b69..50a27f6 100644
--- a/src/main/java/svar/ajneb97/config/model/CommonConfig.java
+++ b/src/main/java/svar/ajneb97/config/model/CommonConfig.java
@@ -7,19 +7,21 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.util.logging.Level;
 
+@SuppressWarnings("ResultOfMethodCallIgnored")
 public class CommonConfig {
 
-    private String fileName;
+    private final String fileName;
     private FileConfiguration fileConfiguration = null;
     private File file = null;
     private String route;
-    private ServerVariables plugin;
-    private String folderName;
-    private boolean newFile;
+    private final ServerVariables plugin;
+    private final String folderName;
+    private final boolean newFile;
     private boolean isFirstTime;
 
-    public CommonConfig(String fileName, ServerVariables plugin, String folderName, boolean newFile){
+    public CommonConfig(String fileName, ServerVariables plugin, String folderName, boolean newFile) {
         this.fileName = fileName;
         this.plugin = plugin;
         this.newFile = newFile;
@@ -27,31 +29,31 @@ public CommonConfig(String fileName, ServerVariables plugin, String folderName,
         this.isFirstTime = false;
     }
 
-    public String getPath(){
+    public String getPath() {
         return this.fileName;
     }
 
-    public void registerConfig(){
-        if(folderName != null){
-            file = new File(plugin.getDataFolder() +File.separator + folderName,fileName);
-        }else{
+    public void registerConfig() {
+        if (folderName != null) {
+            file = new File(plugin.getDataFolder() + File.separator + folderName, fileName);
+        } else {
             file = new File(plugin.getDataFolder(), fileName);
         }
 
         route = file.getPath();
 
-        if(!file.exists()){
+        if (!file.exists()) {
             isFirstTime = true;
-            if(newFile) {
+            if (newFile) {
                 try {
                     file.createNewFile();
                 } catch (IOException e) {
-                    e.printStackTrace();
+                    plugin.getLogger().log(Level.WARNING, "Error creating file " + fileName, e);
                 }
-            }else {
-                if(folderName != null){
-                    plugin.saveResource(folderName+File.separator+fileName, false);
-                }else{
+            } else {
+                if (folderName != null) {
+                    plugin.saveResource(folderName + File.separator + fileName, false);
+                } else {
                     plugin.saveResource(fileName, false);
                 }
 
@@ -61,17 +63,16 @@ public void registerConfig(){
         fileConfiguration = new YamlConfiguration();
         try {
             fileConfiguration.load(file);
-        } catch (IOException e) {
-            e.printStackTrace();
-        } catch (InvalidConfigurationException e) {
-            e.printStackTrace();
+        } catch (IOException | InvalidConfigurationException e) {
+            plugin.getLogger().log(Level.WARNING, "Error loading file " + fileName, e);
         }
     }
+
     public void saveConfig() {
         try {
             fileConfiguration.save(file);
         } catch (IOException e) {
-            e.printStackTrace();
+            plugin.getLogger().log(Level.WARNING, "Error saving file " + fileName, e);
         }
     }
 
@@ -84,16 +85,16 @@ public FileConfiguration getConfig() {
 
     public boolean reloadConfig() {
         if (fileConfiguration == null) {
-            if(folderName != null){
-                file = new File(plugin.getDataFolder() +File.separator + folderName, fileName);
-            }else{
+            if (folderName != null) {
+                file = new File(plugin.getDataFolder() + File.separator + folderName, fileName);
+            } else {
                 file = new File(plugin.getDataFolder(), fileName);
             }
 
         }
         fileConfiguration = YamlConfiguration.loadConfiguration(file);
 
-        if(file != null) {
+        if (file != null) {
             YamlConfiguration defConfig = YamlConfiguration.loadConfiguration(file);
             fileConfiguration.setDefaults(defConfig);
         }
@@ -103,12 +104,4 @@ public boolean reloadConfig() {
     public String getRoute() {
         return route;
     }
-
-    public boolean isFirstTime() {
-        return isFirstTime;
-    }
-
-    public void setFirstTime(boolean firstTime) {
-        isFirstTime = firstTime;
-    }
 }
diff --git a/src/main/java/svar/ajneb97/database/HikariConnection.java b/src/main/java/svar/ajneb97/database/HikariConnection.java
index cc79dc5..8d4db98 100644
--- a/src/main/java/svar/ajneb97/database/HikariConnection.java
+++ b/src/main/java/svar/ajneb97/database/HikariConnection.java
@@ -4,42 +4,43 @@
 import com.zaxxer.hikari.HikariDataSource;
 import org.bukkit.configuration.file.FileConfiguration;
 
+@SuppressWarnings("DataFlowIssue")
 public class HikariConnection {
 
-    private HikariDataSource hikari;
+    private final HikariDataSource hikari;
 
     public HikariConnection(FileConfiguration config) {
         HikariConfig hikariConfig = new HikariConfig();
         String path = "config.mysql_database";
 
-        String host = config.getString(path+".host");
-        int port = config.getInt(path+".port");
-        String database = config.getString(path+".database");
-        String username = config.getString(path+".username");
-        String password = config.getString(path+".password");
+        String host = config.getString(path + ".host");
+        int port = config.getInt(path + ".port");
+        String database = config.getString(path + ".database");
+        String username = config.getString(path + ".username");
+        String password = config.getString(path + ".password");
 
         hikariConfig.setJdbcUrl("jdbc:mysql://" + host + ":" + port + "/" + database);
         hikariConfig.setUsername(username);
         hikariConfig.setPassword(password);
 
-        if(config.contains(path+".pool.connectionTimeout")){
-            hikariConfig.setConnectionTimeout(config.getLong(path+".pool.connectionTimeout"));
+        if (config.contains(path + ".pool.connectionTimeout")) {
+            hikariConfig.setConnectionTimeout(config.getLong(path + ".pool.connectionTimeout"));
         }
-        if(config.contains(path+".pool.maximumPoolSize")){
-            hikariConfig.setMaximumPoolSize(config.getInt(path+".pool.maximumPoolSize"));
+        if (config.contains(path + ".pool.maximumPoolSize")) {
+            hikariConfig.setMaximumPoolSize(config.getInt(path + ".pool.maximumPoolSize"));
         }
-        if(config.contains(path+".pool.connectionTimeout")){
-            hikariConfig.setKeepaliveTime(config.getLong(path+".pool.keepaliveTime"));
+        if (config.contains(path + ".pool.connectionTimeout")) {
+            hikariConfig.setKeepaliveTime(config.getLong(path + ".pool.keepaliveTime"));
         }
-        if(config.contains(path+".pool.idleTimeout")){
-            hikariConfig.setIdleTimeout(config.getLong(path+".pool.idleTimeout"));
+        if (config.contains(path + ".pool.idleTimeout")) {
+            hikariConfig.setIdleTimeout(config.getLong(path + ".pool.idleTimeout"));
         }
-        if(config.contains(path+".pool.maxLifetime")){
-            hikariConfig.setMaxLifetime(config.getLong(path+".pool.maxLifetime"));
+        if (config.contains(path + ".pool.maxLifetime")) {
+            hikariConfig.setMaxLifetime(config.getLong(path + ".pool.maxLifetime"));
         }
 
-        for(String key : config.getConfigurationSection(path+".advanced").getKeys(false)){
-            hikariConfig.addDataSourceProperty(key,config.get(path+".advanced."+key));
+        for (String key : config.getConfigurationSection(path + ".advanced").getKeys(false)) {
+            hikariConfig.addDataSourceProperty(key, config.get(path + ".advanced." + key));
         }
 
         hikari = new HikariDataSource(hikariConfig);
@@ -50,7 +51,7 @@ public HikariDataSource getHikari() {
     }
 
     public void disable() {
-        if(hikari != null) {
+        if (hikari != null) {
             hikari.close();
         }
     }
diff --git a/src/main/java/svar/ajneb97/database/MySQLConnection.java b/src/main/java/svar/ajneb97/database/MySQLConnection.java
index 40ca3ef..daef630 100644
--- a/src/main/java/svar/ajneb97/database/MySQLConnection.java
+++ b/src/main/java/svar/ajneb97/database/MySQLConnection.java
@@ -2,7 +2,6 @@
 
 import org.bukkit.Bukkit;
 import org.bukkit.configuration.file.FileConfiguration;
-import org.bukkit.scheduler.BukkitRunnable;
 import svar.ajneb97.ServerVariables;
 import svar.ajneb97.managers.MessagesManager;
 import svar.ajneb97.managers.VariablesManager;
@@ -18,26 +17,33 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.*;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 public class MySQLConnection {
 
-    private ServerVariables plugin;
+    private final ServerVariables plugin;
+    private final Logger logger;
+    private final String prefix = ServerVariables.prefix;
     private HikariConnection connection;
+    private final boolean isFolia;
 
-    public MySQLConnection(ServerVariables plugin){
+    public MySQLConnection(ServerVariables plugin) {
         this.plugin = plugin;
+        this.logger = plugin.getLogger();
+        this.isFolia = plugin.isFolia;
     }
 
-    public void setupMySql(){
+    public void setupMySql() {
         FileConfiguration config = plugin.getConfigsManager().getMainConfigManager().getConfigFile().getConfig();
         try {
             connection = new HikariConnection(config);
             connection.getHikari().getConnection();
             createTables();
             loadData();
-            Bukkit.getConsoleSender().sendMessage(MessagesManager.getLegacyColoredMessage(plugin.prefix+" &aSuccessfully connected to the Database."));
-        }catch(Exception e) {
-            Bukkit.getConsoleSender().sendMessage(MessagesManager.getLegacyColoredMessage(plugin.prefix+" &cError while connecting to the Database."));
+            logger.info(MessagesManager.getLegacyColoredMessage(prefix + " &aSuccessfully connected to the Database."));
+        } catch (Exception e) {
+            logger.severe(MessagesManager.getLegacyColoredMessage(prefix + " &cError while connecting to the Database."));
         }
     }
 
@@ -45,15 +51,15 @@ public Connection getConnection() {
         try {
             return connection.getHikari().getConnection();
         } catch (Exception e) {
-            e.printStackTrace();
+            logger.log(Level.SEVERE, "Error getting database connection", e);
             return null;
         }
     }
 
-    public void loadData(){
+    public void loadData() {
         Map<UUID, ServerVariablesPlayer> playerMap = new HashMap<>();
         VariablesManager variablesManager = plugin.getVariablesManager();
-        try(Connection connection = getConnection()){
+        try (Connection connection = getConnection()) {
             PreparedStatement statement = connection.prepareStatement(
                     "SELECT servervariables_players.UUID, servervariables_players.PLAYER_NAME, " +
                             "servervariables_players_variables.NAME, " +
@@ -62,212 +68,229 @@ public void loadData(){
                             "ON servervariables_players.UUID = servervariables_players_variables.UUID");
 
             ResultSet result = statement.executeQuery();
-            while(result.next()){
+            while (result.next()) {
                 UUID uuid = UUID.fromString(result.getString("UUID"));
                 String playerName = result.getString("PLAYER_NAME");
                 String variableName = result.getString("NAME");
                 String variableValue = result.getString("VALUE");
 
-                ServerVariablesPlayer player = playerMap.get(uuid);
-                if(player == null){
-                    //Create and add it
-                    player = new ServerVariablesPlayer(uuid,playerName,new HashMap<>());
-                    playerMap.put(uuid, player);
-                }
+                ServerVariablesPlayer player = playerMap.computeIfAbsent(uuid, u -> new ServerVariablesPlayer(u, playerName, new HashMap<>()));
 
-                if(variableName != null && variableValue != null){
+                if (variableName != null && variableValue != null) {
                     Variable variable = variablesManager.getVariable(variableName);
-                    if(variable == null) {
+                    if (variable == null) {
                         continue;
                     }
 
-                    if(variable.getValueType().equals(ValueType.LIST)){
-                        player.addVariable(new ServerVariablesListVariable(variableName,new ArrayList<>(Arrays.asList(variableValue.split("\\|")))));
-                    }else{
-                        player.addVariable(new ServerVariablesStringVariable(variableName,variableValue));
+                    if (variable.getValueType().equals(ValueType.LIST)) {
+                        player.addVariable(new ServerVariablesListVariable(variableName, new ArrayList<>(Arrays.asList(variableValue.split("\\|")))));
+                    } else {
+                        player.addVariable(new ServerVariablesStringVariable(variableName, variableValue));
                     }
                 }
             }
         } catch (SQLException e) {
-            e.printStackTrace();
+            logger.log(Level.SEVERE, "Error loading data from MySQL", e);
         }
 
         plugin.getPlayerVariablesManager().setPlayerVariables(playerMap);
     }
 
     public void createTables() {
-        try(Connection connection = getConnection()){
+        try (Connection connection = getConnection()) {
             PreparedStatement statement1 = connection.prepareStatement(
                     "CREATE TABLE IF NOT EXISTS servervariables_players" +
-                    " (UUID varchar(36) NOT NULL, " +
-                    " PLAYER_NAME varchar(50), " +
-                    " PRIMARY KEY ( UUID ))"
+                            " (UUID varchar(36) NOT NULL, " +
+                            " PLAYER_NAME varchar(50), " +
+                            " PRIMARY KEY ( UUID ))"
             );
             statement1.executeUpdate();
             PreparedStatement statement2 = connection.prepareStatement(
                     "CREATE TABLE IF NOT EXISTS servervariables_players_variables" +
-                    " (ID int NOT NULL AUTO_INCREMENT, " +
-                    " UUID varchar(36) NOT NULL, " +
-                    " NAME varchar(100), " +
-                    " VALUE text, " +
-                    " PRIMARY KEY ( ID ), " +
-                    " FOREIGN KEY (UUID) REFERENCES servervariables_players(UUID))");
+                            " (ID int NOT NULL AUTO_INCREMENT, " +
+                            " UUID varchar(36) NOT NULL, " +
+                            " NAME varchar(100), " +
+                            " VALUE text, " +
+                            " PRIMARY KEY ( ID ), " +
+                            " FOREIGN KEY (UUID) REFERENCES servervariables_players(UUID))");
             statement2.executeUpdate();
         } catch (SQLException e) {
-            e.printStackTrace();
+            logger.log(Level.SEVERE, "Error creating MySQL tables", e);
         }
     }
 
-    public void getPlayer(String uuid,PlayerCallback callback){
-        new BukkitRunnable(){
-            @Override
-            public void run() {
-                VariablesManager variablesManager = plugin.getVariablesManager();
-                ServerVariablesPlayer player = null;
-                try(Connection connection = getConnection()){
-                    PreparedStatement statement = connection.prepareStatement(
-                            "SELECT servervariables_players.UUID, servervariables_players.PLAYER_NAME, " +
-                                    "servervariables_players_variables.NAME, " +
-                                    "servervariables_players_variables.VALUE " +
-                                    "FROM servervariables_players LEFT JOIN servervariables_players_variables " +
-                                    "ON servervariables_players.UUID = servervariables_players_variables.UUID " +
-                                    "WHERE servervariables_players.UUID = ?");
-
-                    statement.setString(1, uuid);
-                    ResultSet result = statement.executeQuery();
-
-                    boolean firstFind = true;
-                    while(result.next()){
-                        String playerName = result.getString("PLAYER_NAME");
-                        String variableName = result.getString("NAME");
-                        String variableValue = result.getString("VALUE");
-                        if(firstFind){
-                            firstFind = false;
-                            player = new ServerVariablesPlayer(UUID.fromString(uuid),playerName,new HashMap<>());
+    public void getPlayer(String uuid, PlayerCallback callback) {
+        Runnable runnable = () -> {
+            VariablesManager variablesManager = plugin.getVariablesManager();
+            ServerVariablesPlayer player = null;
+            try (Connection connection = getConnection()) {
+                PreparedStatement statement = connection.prepareStatement(
+                        "SELECT servervariables_players.UUID, servervariables_players.PLAYER_NAME, " +
+                                "servervariables_players_variables.NAME, " +
+                                "servervariables_players_variables.VALUE " +
+                                "FROM servervariables_players LEFT JOIN servervariables_players_variables " +
+                                "ON servervariables_players.UUID = servervariables_players_variables.UUID " +
+                                "WHERE servervariables_players.UUID = ?");
+
+                statement.setString(1, uuid);
+                ResultSet result = statement.executeQuery();
+
+                boolean firstFind = true;
+                while (result.next()) {
+                    String playerName = result.getString("PLAYER_NAME");
+                    String variableName = result.getString("NAME");
+                    String variableValue = result.getString("VALUE");
+                    if (firstFind) {
+                        firstFind = false;
+                        player = new ServerVariablesPlayer(UUID.fromString(uuid), playerName, new HashMap<>());
+                    }
+                    if (variableName != null && variableValue != null) {
+                        Variable variable = variablesManager.getVariable(variableName);
+                        if (variable == null) {
+                            continue;
                         }
-                        if(variableName != null && variableValue != null){
-                            Variable variable = variablesManager.getVariable(variableName);
-                            if(variable == null) {
-                                continue;
-                            }
-
-                            if(variable.getValueType().equals(ValueType.LIST)){
-                                player.addVariable(new ServerVariablesListVariable(variableName,new ArrayList<>(Arrays.asList(variableValue.split("\\|")))));
-                            }else{
-                                player.addVariable(new ServerVariablesStringVariable(variableName,variableValue));
-                            }
+
+                        if (variable.getValueType().equals(ValueType.LIST)) {
+                            player.addVariable(new ServerVariablesListVariable(variableName, new ArrayList<>(Arrays.asList(variableValue.split("\\|")))));
+                        } else {
+                            player.addVariable(new ServerVariablesStringVariable(variableName, variableValue));
                         }
                     }
+                }
 
-                    ServerVariablesPlayer finalPlayer = player;
-                    new BukkitRunnable(){
-                        @Override
-                        public void run() {
-                            callback.onDone(finalPlayer);
-                        }
-                    }.runTask(plugin);
-                } catch (SQLException e) {
-                    e.printStackTrace();
+                ServerVariablesPlayer finalPlayer = player;
+                if (isFolia) {
+                    plugin.getServer().getGlobalRegionScheduler().execute(plugin, () -> callback.onDone(finalPlayer));
+                } else {
+                    Bukkit.getScheduler().runTask(plugin, () -> callback.onDone(finalPlayer));
                 }
+            } catch (SQLException e) {
+                logger.log(Level.SEVERE, "Error getting player data from MySQL: " + uuid, e);
             }
-        }.runTaskAsynchronously(plugin);
+        };
+
+        if (isFolia) {
+            plugin.getServer().getAsyncScheduler().runNow(plugin, t -> runnable.run());
+        } else {
+            Bukkit.getScheduler().runTaskAsynchronously(plugin, runnable);
+        }
     }
 
-    public void createPlayer(ServerVariablesPlayer player){
-        new BukkitRunnable(){
-            @Override
-            public void run() {
-                try(Connection connection = getConnection()){
-                    PreparedStatement statement = connection.prepareStatement(
-                            "INSERT INTO servervariables_players " +
-                                    "(UUID, PLAYER_NAME) VALUE (?,?)");
+    public void createPlayer(ServerVariablesPlayer player) {
+        Runnable runnable = () -> {
+            try (Connection connection = getConnection()) {
+                PreparedStatement statement = connection.prepareStatement(
+                        "INSERT INTO servervariables_players " +
+                                "(UUID, PLAYER_NAME) VALUE (?,?)");
 
-                    statement.setString(1, player.getUuid().toString());
-                    statement.setString(2, player.getName());
-                    statement.executeUpdate();
-                } catch (SQLException e) {
-                    e.printStackTrace();
-                }
+                statement.setString(1, player.getUuid().toString());
+                statement.setString(2, player.getName());
+                statement.executeUpdate();
+            } catch (SQLException e) {
+                logger.log(Level.SEVERE, "Error creating player in MySQL: " + player.getName(), e);
             }
-        }.runTaskAsynchronously(plugin);
+        };
+
+        if (isFolia) {
+            plugin.getServer().getAsyncScheduler().runNow(plugin, t -> runnable.run());
+        } else {
+            Bukkit.getScheduler().runTaskAsynchronously(plugin, runnable);
+        }
     }
 
-    public void updatePlayerName(ServerVariablesPlayer player){
-        new BukkitRunnable(){
-            @Override
-            public void run() {
-                try(Connection connection = getConnection()){
-                    PreparedStatement statement = connection.prepareStatement(
-                            "UPDATE servervariables_players SET " +
-                                    "PLAYER_NAME=? WHERE UUID=?");
+    public void updatePlayerName(ServerVariablesPlayer player) {
+        Runnable runnable = () -> {
+            try (Connection connection = getConnection()) {
+                PreparedStatement statement = connection.prepareStatement(
+                        "UPDATE servervariables_players SET " +
+                                "PLAYER_NAME=? WHERE UUID=?");
 
-                    statement.setString(1, player.getName());
-                    statement.setString(2, player.getUuid().toString());
-                    statement.executeUpdate();
-                } catch (SQLException e) {
-                    e.printStackTrace();
-                }
+                statement.setString(1, player.getName());
+                statement.setString(2, player.getUuid().toString());
+                statement.executeUpdate();
+            } catch (SQLException e) {
+                logger.log(Level.SEVERE, "Error updating player name in MySQL: " + player.getName(), e);
             }
-        }.runTaskAsynchronously(plugin);
+        };
+
+        if (isFolia) {
+            plugin.getServer().getAsyncScheduler().runNow(plugin, t -> runnable.run());
+        } else {
+            Bukkit.getScheduler().runTaskAsynchronously(plugin, runnable);
+        }
     }
 
-    public void updateVariable(ServerVariablesPlayer player,String variable,String value){
+    public void updateVariable(ServerVariablesPlayer player, String variable, String value) {
         ServerVariablesVariable v = player.getCurrentVariable(variable);
-        new BukkitRunnable(){
-            @Override
-            public void run() {
-                try(Connection connection = getConnection()){
-                    PreparedStatement statement = null;
-                    if(v == null){
-                        // Insert
-                        statement = connection.prepareStatement(
-                                "INSERT INTO servervariables_players_variables " +
-                                        "(UUID, NAME, VALUE) VALUE (?,?,?)");
-
-                        statement.setString(1, player.getUuid().toString());
-                        statement.setString(2, variable);
-                        statement.setString(3, value);
-                    }else{
-                        // Update
-                        statement = connection.prepareStatement(
-                                "UPDATE servervariables_players_variables SET " +
-                                        "VALUE=? WHERE UUID=? AND NAME=?");
-
-                        statement.setString(1, value);
-                        statement.setString(2, player.getUuid().toString());
-                        statement.setString(3, variable);
-                    }
-                    statement.executeUpdate();
-                } catch (SQLException e) {
-                    e.printStackTrace();
+        Runnable runnable = () -> {
+            try (Connection connection = getConnection()) {
+                PreparedStatement statement;
+
+                if (v == null) {
+                    // Insert
+                    statement = connection.prepareStatement(
+                            "INSERT INTO servervariables_players_variables " +
+                                    "(UUID, NAME, VALUE) VALUE (?,?,?)");
+
+                    statement.setString(1, player.getUuid().toString());
+                    statement.setString(2, variable);
+                    statement.setString(3, value);
+                } else {
+                    // Update
+                    statement = connection.prepareStatement(
+                            "UPDATE servervariables_players_variables SET " +
+                                    "VALUE=? WHERE UUID=? AND NAME=?");
+
+                    statement.setString(1, value);
+                    statement.setString(2, player.getUuid().toString());
+                    statement.setString(3, variable);
                 }
+
+                statement.executeUpdate();
+            } catch (SQLException e) {
+                logger.log(Level.SEVERE, "Error updating variable '" + variable + "' for player: " + player.getName(), e);
             }
-        }.runTaskAsynchronously(plugin);
+        };
+
+        if (isFolia) {
+            plugin.getServer().getAsyncScheduler().runNow(plugin, t -> runnable.run());
+        } else {
+            Bukkit.getScheduler().runTaskAsynchronously(plugin, runnable);
+        }
     }
 
-    public void resetVariable(ServerVariablesPlayer player,String variable,boolean all){
-        new BukkitRunnable(){
-            @Override
-            public void run() {
-                try(Connection connection = getConnection()){
-                    PreparedStatement statement;
-                    if(all){
-                        statement = connection.prepareStatement(
-                                "DELETE FROM servervariables_players_variables " +
-                                        "WHERE NAME=?");
-                        statement.setString(1, variable);
-                    }else{
-                        statement = connection.prepareStatement(
-                                "DELETE FROM servervariables_players_variables " +
-                                        "WHERE UUID=? AND NAME=?");
-                        statement.setString(1, player.getUuid().toString());
-                        statement.setString(2, variable);
-                    }
-                    statement.executeUpdate();
-                } catch (SQLException e) {
-                    e.printStackTrace();
+    public void resetVariable(ServerVariablesPlayer player, String variable, boolean all) {
+        Runnable runnable = () -> {
+            try (Connection connection = getConnection()) {
+                PreparedStatement statement;
+                if (all) {
+                    statement = connection.prepareStatement(
+                            "DELETE FROM servervariables_players_variables " +
+                                    "WHERE NAME=?");
+                    statement.setString(1, variable);
+                } else {
+                    statement = connection.prepareStatement(
+                            "DELETE FROM servervariables_players_variables " +
+                                    "WHERE UUID=? AND NAME=?");
+                    statement.setString(1, player.getUuid().toString());
+                    statement.setString(2, variable);
                 }
+                statement.executeUpdate();
+            } catch (SQLException e) {
+                logger.log(Level.SEVERE, "Error resetting variable '" + variable + "' in MySQL", e);
             }
-        }.runTaskAsynchronously(plugin);
+        };
+
+        if (isFolia) {
+            plugin.getServer().getAsyncScheduler().runNow(plugin, t -> runnable.run());
+        } else {
+            Bukkit.getScheduler().runTaskAsynchronously(plugin, runnable);
+        }
+    }
+
+    public void disable() {
+        if (connection != null) {
+            connection.disable();
+        }
     }
 }
diff --git a/src/main/java/svar/ajneb97/listeners/PlayerListener.java b/src/main/java/svar/ajneb97/listeners/PlayerListener.java
index 82859ea..c503a4e 100644
--- a/src/main/java/svar/ajneb97/listeners/PlayerListener.java
+++ b/src/main/java/svar/ajneb97/listeners/PlayerListener.java
@@ -9,13 +9,15 @@
 
 public class PlayerListener implements Listener {
 
-    private ServerVariables plugin;
+    private final ServerVariables plugin;
+    private final String prefix = ServerVariables.prefix;
+
     public PlayerListener(ServerVariables plugin) {
         this.plugin = plugin;
     }
 
     @EventHandler
-    public void onJoin(PlayerJoinEvent event){
+    public void onJoin(PlayerJoinEvent event) {
         Player player = event.getPlayer();
 
         //Create or update player data
@@ -23,8 +25,8 @@ public void onJoin(PlayerJoinEvent event){
 
         //Update notification
         String latestVersion = plugin.getUpdateCheckerManager().getLatestVersion();
-        if(player.isOp() && plugin.getConfigsManager().getMainConfigManager().isUpdateNotify() && !plugin.version.equals(latestVersion)){
-            player.sendMessage(MessagesManager.getLegacyColoredMessage(plugin.prefix+" &cThere is a new version available. &e(&7"+latestVersion+"&e)"));
+        if (player.isOp() && plugin.getConfigsManager().getMainConfigManager().isUpdateNotify() && !plugin.version.equals(latestVersion)) {
+            player.sendMessage(MessagesManager.getLegacyColoredMessage(prefix + " &cThere is a new version available. &e(&7" + latestVersion + "&e)"));
             player.sendMessage(MessagesManager.getLegacyColoredMessage("&cYou can download it at: &ahttps://modrinth.com/plugin/servervariables"));
         }
     }
diff --git a/src/main/java/svar/ajneb97/managers/ListVariablesManager.java b/src/main/java/svar/ajneb97/managers/ListVariablesManager.java
index 511fd2b..6f87c28 100644
--- a/src/main/java/svar/ajneb97/managers/ListVariablesManager.java
+++ b/src/main/java/svar/ajneb97/managers/ListVariablesManager.java
@@ -9,52 +9,52 @@
 import svar.ajneb97.model.structure.*;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
+@SuppressWarnings("DataFlowIssue")
 public class ListVariablesManager {
 
-    private ServerVariables plugin;
+    private final ServerVariables plugin;
 
-    public ListVariablesManager(ServerVariables plugin){
+    public ListVariablesManager(ServerVariables plugin) {
         this.plugin = plugin;
     }
 
-    public StringVariableResult getListVariableValueAtIndex(String playerName, String variableName, int index){
+    public StringVariableResult getListVariableValueAtIndex(String playerName, String variableName, int index) {
         FileConfiguration config = plugin.getConfigsManager().getMainConfigManager().getConfig();
 
-        ListVariableResult listVariableResult = getListVariableValue(playerName,variableName,false);
-        if(listVariableResult.isError()){
+        ListVariableResult listVariableResult = getListVariableValue(playerName, variableName, false);
+        if (listVariableResult.isError()) {
             return listVariableResult.toStringVariableResult();
         }
         List<String> variableValue = listVariableResult.getResultValue();
 
-        // Check if index is out of bounds
-        if(index >= variableValue.size()){
+        // Check if the index is out of bounds
+        if (index >= variableValue.size()) {
             return StringVariableResult.error(config.getString("messages.variableListIndexError")
-                    .replace("%index%",index+""),"variableListIndexError");
+                    .replace("%index%", index + ""), "variableListIndexError");
         }
 
-        return StringVariableResult.noErrorsWithVariable(variableValue.get(index),listVariableResult.getVariable());
+        return StringVariableResult.noErrorsWithVariable(variableValue.get(index), listVariableResult.getVariable());
     }
 
-    public StringVariableResult setListVariableValue(String playerName, String variableName, int index, String newValue, boolean add){
+    public StringVariableResult setListVariableValue(String playerName, String variableName, int index, String newValue, boolean add) {
         FileConfiguration config = plugin.getConfigsManager().getMainConfigManager().getConfig();
         VariablesManager variablesManager = plugin.getVariablesManager();
 
         // Common verifications.
-        StringVariableResult checkCommon = variablesManager.checkVariableCommon(variableName,newValue);
-        if(checkCommon.isError()){
+        StringVariableResult checkCommon = variablesManager.checkVariableCommon(variableName, newValue);
+        if (checkCommon.isError()) {
             return checkCommon;
         }
 
         // Verify if resultValue exists.
-        if(checkCommon.getResultValue() != null){
+        if (checkCommon.getResultValue() != null) {
             newValue = checkCommon.getResultValue();
         }
 
-        ListVariableResult listVariableResult = getListVariableValue(playerName,variableName,true);
-        if(listVariableResult.isError()){
+        ListVariableResult listVariableResult = getListVariableValue(playerName, variableName, true);
+        if (listVariableResult.isError()) {
             return listVariableResult.toStringVariableResult();
         }
 
@@ -65,26 +65,26 @@ public StringVariableResult setListVariableValue(String playerName, String varia
         ServerVariablesManager serverVariablesManager = plugin.getServerVariablesManager();
 
         List<String> oldValue = new ArrayList<>(variableValue);
-        if(!add){
+        if (!add) {
             // Set value at index.
-            // Check if index is out of bounds
-            if(index >= variableValue.size()){
+            // Check if the index is out of bounds
+            if (index >= variableValue.size()) {
                 return StringVariableResult.error(config.getString("messages.variableListIndexError")
-                        .replace("%index%",index+""),"variableListIndexError");
+                        .replace("%index%", index + ""), "variableListIndexError");
             }
 
             // Update index with new value.
-            variableValue.set(index,newValue);
-        }else{
-            // Add value to end of list.
-            // Update list with new value.
+            variableValue.set(index, newValue);
+        } else {
+            // Add value to the end of a list.
+            // Update the list with a new value.
             variableValue.add(newValue);
-            index = variableValue.size()-1;
+            index = variableValue.size() - 1;
         }
 
         // Update data.
         Player player = playerName != null ? Bukkit.getPlayer(playerName) : null;
-        updateVariableData(playerName,variableName,variableValue,currentVariable,serverVariablesPlayer,serverVariablesManager);
+        updateVariableData(playerName, variableName, variableValue, currentVariable, serverVariablesPlayer, serverVariablesManager);
 
         plugin.getServer().getPluginManager().callEvent(
                 new ListVariableChangeEvent(player, variable, variableValue, oldValue, index));
@@ -92,47 +92,47 @@ public StringVariableResult setListVariableValue(String playerName, String varia
         return StringVariableResult.noErrors(newValue).withIndex(index);
     }
 
-    public ListVariableResult getListVariableValue(String playerName, String variableName, boolean modifying){
+    public ListVariableResult getListVariableValue(String playerName, String variableName, boolean modifying) {
         FileConfiguration config = plugin.getConfigsManager().getMainConfigManager().getConfig();
 
-        // Check if variables exists
+        // Check if variables exist
         Variable aVariable = plugin.getVariablesManager().getVariable(variableName);
-        if(aVariable == null){
-            return ListVariableResult.error(config.getString("messages.variableDoesNotExists"),"variableDoesNotExists");
+        if (aVariable == null) {
+            return ListVariableResult.error(config.getString("messages.variableDoesNotExists"), "variableDoesNotExists");
         }
 
         // Check if variable is not LIST
-        if(!aVariable.getValueType().equals(ValueType.LIST)){
-            return ListVariableResult.error(config.getString("messages.variableNotList"),"variableNotList");
+        if (!aVariable.getValueType().equals(ValueType.LIST)) {
+            return ListVariableResult.error(config.getString("messages.variableNotList"), "variableNotList");
         }
 
         ListVariable variable = (ListVariable) aVariable;
         ServerVariablesListVariable currentVariable;
         ServerVariablesPlayer serverVariablesPlayer = null;
-        if(playerName != null){
-            // The variable should be PLAYER type.
-            if(variable.getVariableType().equals(VariableType.GLOBAL)){
-                if(modifying){
-                    return ListVariableResult.error(config.getString("messages.variableSetInvalidTypeGlobal"),"variableSetInvalidTypeGlobal");
-                }else{
-                    return ListVariableResult.error(config.getString("messages.variableGetInvalidTypeGlobal"),"variableGetInvalidTypeGlobal");
+        if (playerName != null) {
+            // The variable should be a PLAYER type.
+            if (variable.getVariableType().equals(VariableType.GLOBAL)) {
+                if (modifying) {
+                    return ListVariableResult.error(config.getString("messages.variableSetInvalidTypeGlobal"), "variableSetInvalidTypeGlobal");
+                } else {
+                    return ListVariableResult.error(config.getString("messages.variableGetInvalidTypeGlobal"), "variableGetInvalidTypeGlobal");
                 }
             }
 
-            // Check if player has joined the server.
+            // Check if the player has joined the server.
             serverVariablesPlayer = plugin.getPlayerVariablesManager().getPlayerByName(playerName);
-            if(serverVariablesPlayer == null){
-                return ListVariableResult.error(config.getString("messages.playerNoData"),"playerNoData");
+            if (serverVariablesPlayer == null) {
+                return ListVariableResult.error(config.getString("messages.playerNoData"), "playerNoData");
             }
 
             currentVariable = (ServerVariablesListVariable) serverVariablesPlayer.getCurrentVariable(variableName);
-        }else{
-            // The variable should be GLOBAL type.
-            if(variable.getVariableType().equals(VariableType.PLAYER)){
-                if(modifying){
-                    return ListVariableResult.error(config.getString("messages.variableSetInvalidTypePlayer"),"variableSetInvalidTypePlayer");
-                }else{
-                    return ListVariableResult.error(config.getString("messages.variableGetInvalidTypePlayer"),"variableGetInvalidTypePlayer");
+        } else {
+            // The variable should be a GLOBAL type.
+            if (variable.getVariableType().equals(VariableType.PLAYER)) {
+                if (modifying) {
+                    return ListVariableResult.error(config.getString("messages.variableSetInvalidTypePlayer"), "variableSetInvalidTypePlayer");
+                } else {
+                    return ListVariableResult.error(config.getString("messages.variableGetInvalidTypePlayer"), "variableGetInvalidTypePlayer");
                 }
             }
 
@@ -140,22 +140,22 @@ public ListVariableResult getListVariableValue(String playerName, String variabl
         }
 
         List<String> variableValue;
-        if(currentVariable == null){
+        if (currentVariable == null) {
             // The variable is not set. Get initial value.
             variableValue = new ArrayList<>(variable.getInitialValue());
-        }else{
+        } else {
             variableValue = currentVariable.getCurrentValue();
         }
 
-        return ListVariableResult.noErrorsWithVariable(variableValue,variable).withCurrentVariable(currentVariable)
+        return ListVariableResult.noErrorsWithVariable(variableValue, variable).withCurrentVariable(currentVariable)
                 .withServerVariablesPlayer(serverVariablesPlayer);
     }
 
-    public StringVariableResult removeListVariableIndex(String playerName, String variableName, int index){
+    public StringVariableResult removeListVariableIndex(String playerName, String variableName, int index) {
         FileConfiguration config = plugin.getConfigsManager().getMainConfigManager().getConfig();
 
-        ListVariableResult listVariableResult = getListVariableValue(playerName,variableName,true);
-        if(listVariableResult.isError()){
+        ListVariableResult listVariableResult = getListVariableValue(playerName, variableName, true);
+        if (listVariableResult.isError()) {
             return listVariableResult.toStringVariableResult();
         }
 
@@ -167,9 +167,9 @@ public StringVariableResult removeListVariableIndex(String playerName, String va
 
         List<String> oldValue = new ArrayList<>(variableValue);
 
-        if(index >= variableValue.size()){
+        if (index >= variableValue.size()) {
             return StringVariableResult.error(config.getString("messages.variableListIndexError")
-                    .replace("%index%",index+""),"variableListIndexError");
+                    .replace("%index%", index + ""), "variableListIndexError");
         }
 
         // Remove index.
@@ -177,7 +177,7 @@ public StringVariableResult removeListVariableIndex(String playerName, String va
 
         // Update data.
         Player player = playerName != null ? Bukkit.getPlayer(playerName) : null;
-        updateVariableData(playerName,variableName,variableValue,currentVariable,serverVariablesPlayer,serverVariablesManager);
+        updateVariableData(playerName, variableName, variableValue, currentVariable, serverVariablesPlayer, serverVariablesManager);
 
         plugin.getServer().getPluginManager().callEvent(
                 new ListVariableChangeEvent(player, variable, variableValue, oldValue, index));
@@ -185,11 +185,11 @@ public StringVariableResult removeListVariableIndex(String playerName, String va
         return StringVariableResult.noErrors(null).withIndex(index);
     }
 
-    public StringVariableResult removeListVariableValue(String playerName, String variableName, String value){
+    public StringVariableResult removeListVariableValue(String playerName, String variableName, String value) {
         FileConfiguration config = plugin.getConfigsManager().getMainConfigManager().getConfig();
 
-        ListVariableResult listVariableResult = getListVariableValue(playerName,variableName,true);
-        if(listVariableResult.isError()){
+        ListVariableResult listVariableResult = getListVariableValue(playerName, variableName, true);
+        if (listVariableResult.isError()) {
             return listVariableResult.toStringVariableResult();
         }
 
@@ -202,14 +202,14 @@ public StringVariableResult removeListVariableValue(String playerName, String va
         List<String> oldValue = new ArrayList<>(variableValue);
 
         // Remove index.
-        if(!variableValue.remove(value)){
+        if (!variableValue.remove(value)) {
             return StringVariableResult.error(config.getString("messages.variableListValueError")
-                    .replace("%value%",value),"variableListValueError");
+                    .replace("%value%", value), "variableListValueError");
         }
 
         // Update data.
         Player player = playerName != null ? Bukkit.getPlayer(playerName) : null;
-        updateVariableData(playerName,variableName,variableValue,currentVariable,serverVariablesPlayer,serverVariablesManager);
+        updateVariableData(playerName, variableName, variableValue, currentVariable, serverVariablesPlayer, serverVariablesManager);
 
         plugin.getServer().getPluginManager().callEvent(
                 new ListVariableChangeEvent(player, variable, variableValue, oldValue, -1));
@@ -217,28 +217,28 @@ public StringVariableResult removeListVariableValue(String playerName, String va
         return StringVariableResult.noErrors(null);
     }
 
-    private void updateVariableData(String playerName,String variableName,List<String> variableValue,ServerVariablesListVariable currentVariable,
-                                    ServerVariablesPlayer serverVariablesPlayer,ServerVariablesManager serverVariablesManager){
-        if(playerName != null){
-            if(plugin.getMySQLConnection() != null) {
-                plugin.getMySQLConnection().updateVariable(serverVariablesPlayer,variableName,valueFromListToString(variableValue));
+    private void updateVariableData(String playerName, String variableName, List<String> variableValue, ServerVariablesListVariable currentVariable,
+                                    ServerVariablesPlayer serverVariablesPlayer, ServerVariablesManager serverVariablesManager) {
+        if (playerName != null) {
+            if (plugin.getMySQLConnection() != null) {
+                plugin.getMySQLConnection().updateVariable(serverVariablesPlayer, variableName, valueFromListToString(variableValue));
             }
-            if(currentVariable == null){
-                serverVariablesPlayer.addVariable(new ServerVariablesListVariable(variableName,variableValue));
-            }else{
+            if (currentVariable == null) {
+                serverVariablesPlayer.addVariable(new ServerVariablesListVariable(variableName, variableValue));
+            } else {
                 currentVariable.setCurrentValue(variableValue);
             }
             serverVariablesPlayer.setModified(true);
-        }else{
-            if(currentVariable == null){
-                serverVariablesManager.addVariable(new ServerVariablesListVariable(variableName,variableValue));
-            }else{
+        } else {
+            if (currentVariable == null) {
+                serverVariablesManager.addVariable(new ServerVariablesListVariable(variableName, variableValue));
+            } else {
                 currentVariable.setCurrentValue(variableValue);
             }
         }
     }
 
-    private String valueFromListToString(List<String> variableValue){
+    private String valueFromListToString(List<String> variableValue) {
         return String.join("|", variableValue);
     }
 }
diff --git a/src/main/java/svar/ajneb97/managers/MessagesManager.java b/src/main/java/svar/ajneb97/managers/MessagesManager.java
index b322af4..c49bd31 100644
--- a/src/main/java/svar/ajneb97/managers/MessagesManager.java
+++ b/src/main/java/svar/ajneb97/managers/MessagesManager.java
@@ -2,7 +2,6 @@
 
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import net.md_5.bungee.api.ChatColor;
-import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import svar.ajneb97.api.ServerVariablesAPI;
 import svar.ajneb97.utils.OtherUtils;
@@ -10,25 +9,27 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+@SuppressWarnings("deprecation")
 public class MessagesManager {
 
-    private String prefix;
+    private final String prefix;
+
     public MessagesManager(String prefix) {
         this.prefix = prefix;
     }
 
     public void sendMessage(CommandSender sender, String message, boolean prefix) {
-        if(!message.isEmpty()) {
-            if(ServerVariablesAPI.getPlugin().getConfigsManager().getMainConfigManager().isUseMiniMessage()){
-                if(prefix){
-                    sender.sendMessage(MiniMessage.miniMessage().deserialize(this.prefix+message));
-                }else{
+        if (!message.isEmpty()) {
+            if (ServerVariablesAPI.getPlugin().getConfigsManager().getMainConfigManager().isUseMiniMessage()) {
+                if (prefix) {
+                    sender.sendMessage(MiniMessage.miniMessage().deserialize(this.prefix + message));
+                } else {
                     sender.sendMessage(MiniMessage.miniMessage().deserialize(message));
                 }
-            }else{
-                if(prefix){
-                    sender.sendMessage(getLegacyColoredMessage(this.prefix+message));
-                }else{
+            } else {
+                if (prefix) {
+                    sender.sendMessage(getLegacyColoredMessage(this.prefix + message));
+                } else {
                     sender.sendMessage(getLegacyColoredMessage(message));
                 }
             }
@@ -36,13 +37,13 @@ public void sendMessage(CommandSender sender, String message, boolean prefix) {
     }
 
     public static String getLegacyColoredMessage(String message) {
-        if(OtherUtils.isNew()) {
+        if (OtherUtils.isNew()) {
             Pattern pattern = Pattern.compile("#[a-fA-F0-9]{6}");
             Matcher match = pattern.matcher(message);
 
-            while(match.find()) {
-                String color = message.substring(match.start(),match.end());
-                message = message.replace(color, ChatColor.of(color)+"");
+            while (match.find()) {
+                String color = message.substring(match.start(), match.end());
+                message = message.replace(color, ChatColor.of(color) + "");
 
                 match = pattern.matcher(message);
             }
diff --git a/src/main/java/svar/ajneb97/managers/PlayerVariablesManager.java b/src/main/java/svar/ajneb97/managers/PlayerVariablesManager.java
index 035fbba..1c5381c 100644
--- a/src/main/java/svar/ajneb97/managers/PlayerVariablesManager.java
+++ b/src/main/java/svar/ajneb97/managers/PlayerVariablesManager.java
@@ -12,137 +12,138 @@
 import java.util.UUID;
 
 public class PlayerVariablesManager {
-    private ServerVariables plugin;
-    private Map<UUID,ServerVariablesPlayer> playerVariables;
-    private Map<String,UUID> playerNames;
+
+    private final ServerVariables plugin;
+    private Map<UUID, ServerVariablesPlayer> playerVariables;
+    private final Map<String, UUID> playerNames;
 
     public PlayerVariablesManager(ServerVariables plugin) {
         this.plugin = plugin;
         this.playerNames = new HashMap<>();
     }
 
-    public Map<UUID,ServerVariablesPlayer> getPlayerVariables() {
+    public Map<UUID, ServerVariablesPlayer> getPlayerVariables() {
         return playerVariables;
     }
 
-    public void setPlayerVariables(Map<UUID,ServerVariablesPlayer> playerVariables) {
+    public void setPlayerVariables(Map<UUID, ServerVariablesPlayer> playerVariables) {
         this.playerVariables = playerVariables;
-        for(Map.Entry<UUID, ServerVariablesPlayer> entry : playerVariables.entrySet()){
-            playerNames.put(entry.getValue().getName(),entry.getKey());
+        for (Map.Entry<UUID, ServerVariablesPlayer> entry : playerVariables.entrySet()) {
+            playerNames.put(entry.getValue().getName(), entry.getKey());
         }
     }
 
-    public void addPlayer(ServerVariablesPlayer p){
-        playerVariables.put(p.getUuid(),p);
+    public void addPlayer(ServerVariablesPlayer p) {
+        playerVariables.put(p.getUuid(), p);
         playerNames.put(p.getName(), p.getUuid());
     }
 
-    private void updatePlayerName(String oldName,String newName,UUID uuid){
-        if(oldName != null){
+    private void updatePlayerName(String oldName, String newName, UUID uuid) {
+        if (oldName != null) {
             playerNames.remove(oldName);
         }
-        playerNames.put(newName,uuid);
+        playerNames.put(newName, uuid);
     }
 
-    public ServerVariablesPlayer getPlayerByUUID(UUID uuid){
+    public ServerVariablesPlayer getPlayerByUUID(UUID uuid) {
         return playerVariables.get(uuid);
     }
 
-    private UUID getPlayerUUID(String name){
+    private UUID getPlayerUUID(String name) {
         return playerNames.get(name);
     }
 
-    public ServerVariablesPlayer getPlayerByName(String name){
+    public ServerVariablesPlayer getPlayerByName(String name) {
         UUID uuid = getPlayerUUID(name);
         return playerVariables.get(uuid);
     }
 
-    public void removePlayerByUUID(UUID uuid){
+    public void removePlayerByUUID(UUID uuid) {
         playerVariables.remove(uuid);
     }
 
     // When joining the game
-    public void setJoinPlayerData(Player player){
-        if(plugin.getMySQLConnection() != null){
+    public void setJoinPlayerData(Player player) {
+        if (plugin.getMySQLConnection() != null) {
             MySQLConnection mySQLConnection = plugin.getMySQLConnection();
             UUID uuid = player.getUniqueId();
             mySQLConnection.getPlayer(uuid.toString(), playerData -> {
-                removePlayerByUUID(uuid); //Remove data if already exists
-                if(playerData != null) {
+                removePlayerByUUID(uuid); // Remove data if already exists
+                if (playerData != null) {
                     addPlayer(playerData);
                     //Update name if different
-                    if(!playerData.getName().equals(player.getName())){
-                        updatePlayerName(playerData.getName(),player.getName(),player.getUniqueId());
+                    if (!playerData.getName().equals(player.getName())) {
+                        updatePlayerName(playerData.getName(), player.getName(), player.getUniqueId());
                         playerData.setName(player.getName());
                         mySQLConnection.updatePlayerName(playerData);
                     }
-                }else {
-                    playerData = new ServerVariablesPlayer(uuid,player.getName(),new HashMap<>());
+                } else {
+                    playerData = new ServerVariablesPlayer(uuid, player.getName(), new HashMap<>());
                     addPlayer(playerData);
                     //Create if it doesn't exist
                     mySQLConnection.createPlayer(playerData);
                 }
             });
-        }else{
-            ServerVariablesPlayer p = getPlayerByUUID(player.getUniqueId());
-            if(p != null){
-                //Update name
-                if(p.getName() == null || !p.getName().equals(player.getName())){
-                    updatePlayerName(p.getName(),player.getName(),player.getUniqueId());
-                    p.setName(player.getName());
-                    p.setModified(true);
+        } else {
+            ServerVariablesPlayer playerData = getPlayerByUUID(player.getUniqueId());
+            if (playerData != null) {
+                // Update name
+                if (playerData.getName() == null || !playerData.getName().equals(player.getName())) {
+                    updatePlayerName(playerData.getName(), player.getName(), player.getUniqueId());
+                    playerData.setName(player.getName());
+                    playerData.setModified(true);
                 }
-            }else{
-                //Create empty data for player
-                p = new ServerVariablesPlayer(player.getUniqueId(),player.getName(),new HashMap<>());
-                p.setModified(true);
-                addPlayer(p);
+            } else {
+                // Create empty data for the player
+                playerData = new ServerVariablesPlayer(player.getUniqueId(), player.getName(), new HashMap<>());
+                playerData.setModified(true);
+                addPlayer(playerData);
             }
         }
     }
 
-    public StringVariableResult setVariable(UUID uuid, String variableName, String newValue){
+    public StringVariableResult setVariable(UUID uuid, String variableName, String newValue) {
         ServerVariablesPlayer variablesPlayer = getPlayerByUUID(uuid);
         return plugin.getVariablesManager().setVariableValue(variablesPlayer.getName(), variableName, newValue);
     }
 
-    public StringVariableResult setVariable(String playerName, String variableName, String newValue){
-        return plugin.getVariablesManager().setVariableValue(playerName,variableName,newValue);
+    public StringVariableResult setVariable(String playerName, String variableName, String newValue) {
+        return plugin.getVariablesManager().setVariableValue(playerName, variableName, newValue);
     }
 
-    public StringVariableResult getVariableValue(UUID uuid, String variableName, boolean modifying){
+    public StringVariableResult getVariableValue(UUID uuid, String variableName, boolean modifying) {
         ServerVariablesPlayer variablesPlayer = getPlayerByUUID(uuid);
-        return plugin.getVariablesManager().getVariableValue(variablesPlayer.getName(),variableName,modifying);
+        return plugin.getVariablesManager().getVariableValue(variablesPlayer.getName(), variableName, modifying);
     }
 
-    public StringVariableResult getVariableValue(String playerName, String variableName, boolean modifying){
-        return plugin.getVariablesManager().getVariableValue(playerName,variableName,modifying);
+    public StringVariableResult getVariableValue(String playerName, String variableName, boolean modifying) {
+        return plugin.getVariablesManager().getVariableValue(playerName, variableName, modifying);
     }
 
-    public StringVariableResult setListVariableAtIndex(UUID uuid, String variableName, int index, String newValue){
+    public StringVariableResult setListVariableAtIndex(UUID uuid, String variableName, int index, String newValue) {
         ServerVariablesPlayer variablesPlayer = getPlayerByUUID(uuid);
         return plugin.getVariablesManager().getListVariablesManager().setListVariableValue(variablesPlayer.getName(), variableName, index, newValue, false);
     }
 
-    public StringVariableResult setListVariableAtIndex(String playerName, String variableName, int index, String newValue){
+    public StringVariableResult setListVariableAtIndex(String playerName, String variableName, int index, String newValue) {
         return plugin.getVariablesManager().getListVariablesManager().setListVariableValue(playerName, variableName, index, newValue, false);
     }
 
-    public StringVariableResult getListVariableValueAtIndex(UUID uuid, String variableName, int index){
+    public StringVariableResult getListVariableValueAtIndex(UUID uuid, String variableName, int index) {
         ServerVariablesPlayer variablesPlayer = getPlayerByUUID(uuid);
-        return plugin.getVariablesManager().getListVariablesManager().getListVariableValueAtIndex(variablesPlayer.getName(),variableName,index);
+        return plugin.getVariablesManager().getListVariablesManager().getListVariableValueAtIndex(variablesPlayer.getName(), variableName, index);
     }
 
-    public StringVariableResult getListVariableValueAtIndex(String playerName, String variableName, int index){
-        return plugin.getVariablesManager().getListVariablesManager().getListVariableValueAtIndex(playerName,variableName,index);
+    public StringVariableResult getListVariableValueAtIndex(String playerName, String variableName, int index) {
+        return plugin.getVariablesManager().getListVariablesManager().getListVariableValueAtIndex(playerName, variableName, index);
     }
 
-    public ListVariableResult getListVariableValue(UUID uuid, String variableName){
+    public ListVariableResult getListVariableValue(UUID uuid, String variableName) {
         ServerVariablesPlayer variablesPlayer = getPlayerByUUID(uuid);
-        return plugin.getVariablesManager().getListVariablesManager().getListVariableValue(variablesPlayer.getName(),variableName,false);
+        return plugin.getVariablesManager().getListVariablesManager().getListVariableValue(variablesPlayer.getName(), variableName, false);
     }
 
-    public ListVariableResult getListVariableValue(String playerName, String variableName){
-        return plugin.getVariablesManager().getListVariablesManager().getListVariableValue(playerName,variableName,false);
+    public ListVariableResult getListVariableValue(String playerName, String variableName) {
+        return plugin.getVariablesManager().getListVariablesManager().getListVariableValue(playerName, variableName, false);
     }
 }
diff --git a/src/main/java/svar/ajneb97/managers/ServerVariablesManager.java b/src/main/java/svar/ajneb97/managers/ServerVariablesManager.java
index 793a838..4415cc4 100644
--- a/src/main/java/svar/ajneb97/managers/ServerVariablesManager.java
+++ b/src/main/java/svar/ajneb97/managers/ServerVariablesManager.java
@@ -1,16 +1,12 @@
 package svar.ajneb97.managers;
 
-import svar.ajneb97.ServerVariables;
 import svar.ajneb97.model.ServerVariablesVariable;
+
 import java.util.Map;
 
 public class ServerVariablesManager {
-    private ServerVariables plugin;
-    private Map<String,ServerVariablesVariable> variables;
 
-    public ServerVariablesManager(ServerVariables plugin) {
-        this.plugin = plugin;
-    }
+    private Map<String, ServerVariablesVariable> variables;
 
     public Map<String, ServerVariablesVariable> getVariables() {
         return variables;
@@ -20,11 +16,11 @@ public void setVariables(Map<String, ServerVariablesVariable> variables) {
         this.variables = variables;
     }
 
-    public void addVariable(ServerVariablesVariable variable){
-        variables.put(variable.getVariableName(),variable);
+    public void addVariable(ServerVariablesVariable variable) {
+        variables.put(variable.getVariableName(), variable);
     }
 
-    public ServerVariablesVariable getCurrentVariable(String variableName){
+    public ServerVariablesVariable getCurrentVariable(String variableName) {
         return variables.get(variableName);
     }
 }
diff --git a/src/main/java/svar/ajneb97/managers/UpdateCheckerManager.java b/src/main/java/svar/ajneb97/managers/UpdateCheckerManager.java
index 90b5bee..d1344ee 100644
--- a/src/main/java/svar/ajneb97/managers/UpdateCheckerManager.java
+++ b/src/main/java/svar/ajneb97/managers/UpdateCheckerManager.java
@@ -9,14 +9,14 @@
 
 public class UpdateCheckerManager {
 
-    private String version;
+    private final String version;
     private String latestVersion;
 
-    public UpdateCheckerManager(String version){
+    public UpdateCheckerManager(String version) {
         this.version = version;
     }
 
-    public UpdateCheckerResult check(){
+    public UpdateCheckerResult check() {
         try {
             HttpURLConnection con = (HttpURLConnection) new URL(
                     "https://api.spigotmc.org/legacy/update.php?resource=107803").openConnection();
@@ -25,7 +25,7 @@ public UpdateCheckerResult check(){
             con.setReadTimeout(timed_out);
             latestVersion = new BufferedReader(new InputStreamReader(con.getInputStream())).readLine();
             if (latestVersion.length() <= 7) {
-                if(!version.equals(latestVersion)){
+                if (!version.equals(latestVersion)) {
                     return UpdateCheckerResult.noErrors(latestVersion);
                 }
             }
diff --git a/src/main/java/svar/ajneb97/managers/VariablesManager.java b/src/main/java/svar/ajneb97/managers/VariablesManager.java
index e3aab31..5b2822f 100644
--- a/src/main/java/svar/ajneb97/managers/VariablesManager.java
+++ b/src/main/java/svar/ajneb97/managers/VariablesManager.java
@@ -17,10 +17,12 @@
 import java.util.Map;
 import java.util.UUID;
 
+@SuppressWarnings("DataFlowIssue")
 public class VariablesManager {
-    private ServerVariables plugin;
-    private ListVariablesManager listVariablesManager;
-    private Map<String,Variable> variables;
+
+    private final ServerVariables plugin;
+    private final ListVariablesManager listVariablesManager;
+    private Map<String, Variable> variables;
 
     public VariablesManager(ServerVariables plugin) {
         this.plugin = plugin;
@@ -35,7 +37,7 @@ public void setVariables(Map<String, Variable> variables) {
         this.variables = variables;
     }
 
-    public Variable getVariable(String name){
+    public Variable getVariable(String name) {
         return variables.get(name);
     }
 
@@ -43,44 +45,44 @@ public ListVariablesManager getListVariablesManager() {
         return listVariablesManager;
     }
 
-    public StringVariableResult getVariableValue(String playerName, @NotNull String variableName, boolean modifying){
+    public StringVariableResult getVariableValue(String playerName, @NotNull String variableName, boolean modifying) {
         FileConfiguration config = plugin.getConfigsManager().getMainConfigManager().getConfig();
 
         Variable aVariable = plugin.getVariablesManager().getVariable(variableName);
-        if(aVariable == null){
-            return StringVariableResult.error(config.getString("messages.variableDoesNotExists"),"variableDoesNotExists");
+        if (aVariable == null) {
+            return StringVariableResult.error(config.getString("messages.variableDoesNotExists"), "variableDoesNotExists");
         }
 
         // Check if variable is LIST
-        if(aVariable.getValueType().equals(ValueType.LIST)){
-            return StringVariableResult.error(config.getString("messages.variableIsList"),"variableIsList");
+        if (aVariable.getValueType().equals(ValueType.LIST)) {
+            return StringVariableResult.error(config.getString("messages.variableIsList"), "variableIsList");
         }
 
         ServerVariablesStringVariable currentVariable;
-        if(playerName != null){
-            // The variable should be PLAYER type.
-            if(aVariable.getVariableType().equals(VariableType.GLOBAL)){
-                if(modifying){
-                    return StringVariableResult.error(config.getString("messages.variableSetInvalidTypeGlobal"),"variableSetInvalidTypeGlobal");
-                }else{
-                    return StringVariableResult.error(config.getString("messages.variableGetInvalidTypeGlobal"),"variableGetInvalidTypeGlobal");
+        if (playerName != null) {
+            // The variable should be a PLAYER type.
+            if (aVariable.getVariableType().equals(VariableType.GLOBAL)) {
+                if (modifying) {
+                    return StringVariableResult.error(config.getString("messages.variableSetInvalidTypeGlobal"), "variableSetInvalidTypeGlobal");
+                } else {
+                    return StringVariableResult.error(config.getString("messages.variableGetInvalidTypeGlobal"), "variableGetInvalidTypeGlobal");
                 }
             }
 
-            // Check if player has joined the server.
+            // Check if the player has joined the server.
             ServerVariablesPlayer serverVariablesPlayer = plugin.getPlayerVariablesManager().getPlayerByName(playerName);
-            if(serverVariablesPlayer == null){
-                return StringVariableResult.error(config.getString("messages.playerNoData"),"playerNoData");
+            if (serverVariablesPlayer == null) {
+                return StringVariableResult.error(config.getString("messages.playerNoData"), "playerNoData");
             }
 
             currentVariable = (ServerVariablesStringVariable) serverVariablesPlayer.getCurrentVariable(variableName);
-        }else{
-            // The variable should be GLOBAL type.
-            if(aVariable.getVariableType().equals(VariableType.PLAYER)){
-                if(modifying){
-                    return StringVariableResult.error(config.getString("messages.variableSetInvalidTypePlayer"),"variableSetInvalidTypePlayer");
-                }else{
-                    return StringVariableResult.error(config.getString("messages.variableGetInvalidTypePlayer"),"variableGetInvalidTypePlayer");
+        } else {
+            // The variable should be a GLOBAL type.
+            if (aVariable.getVariableType().equals(VariableType.PLAYER)) {
+                if (modifying) {
+                    return StringVariableResult.error(config.getString("messages.variableSetInvalidTypePlayer"), "variableSetInvalidTypePlayer");
+                } else {
+                    return StringVariableResult.error(config.getString("messages.variableGetInvalidTypePlayer"), "variableGetInvalidTypePlayer");
                 }
             }
 
@@ -88,230 +90,230 @@ public StringVariableResult getVariableValue(String playerName, @NotNull String
         }
 
         StringVariable variable = (StringVariable) aVariable;
-        if(currentVariable == null){
+        if (currentVariable == null) {
             // Get initial value
-            return StringVariableResult.noErrorsWithVariable(variable.getInitialValue(),variable);
+            return StringVariableResult.noErrorsWithVariable(variable.getInitialValue(), variable);
         }
-        return StringVariableResult.noErrorsWithVariable(currentVariable.getCurrentValue(),variable);
+        return StringVariableResult.noErrorsWithVariable(currentVariable.getCurrentValue(), variable);
     }
 
-    public StringVariableResult setVariableValue(String playerName, @NotNull String variableName, @NotNull String newValue){
+    public StringVariableResult setVariableValue(String playerName, @NotNull String variableName, @NotNull String newValue) {
         FileConfiguration config = plugin.getConfigsManager().getMainConfigManager().getConfig();
         VariablesManager variablesManager = plugin.getVariablesManager();
 
-        StringVariableResult checkCommon = variablesManager.checkVariableCommon(variableName,newValue);
-        if(checkCommon.isError()){
+        StringVariableResult checkCommon = variablesManager.checkVariableCommon(variableName, newValue);
+        if (checkCommon.isError()) {
             return checkCommon;
         }
 
         // Verify if resultValue exists
-        if(checkCommon.getResultValue() != null){
+        if (checkCommon.getResultValue() != null) {
             newValue = checkCommon.getResultValue();
         }
 
         // Check if variable is LIST
         Variable aVariable = checkCommon.getVariable();
-        if(aVariable.getValueType().equals(ValueType.LIST)){
-            return StringVariableResult.error(config.getString("messages.variableIsList"),"variableIsList");
+        if (aVariable.getValueType().equals(ValueType.LIST)) {
+            return StringVariableResult.error(config.getString("messages.variableIsList"), "variableIsList");
         }
 
         ServerVariablesManager serverVariablesManager = plugin.getServerVariablesManager();
         StringVariable variable = (StringVariable) aVariable;
         ServerVariablesStringVariable currentVariable;
         ServerVariablesPlayer serverVariablesPlayer = null;
-        if(playerName != null){
-            // The variable should be PLAYER type.
-            if(variable.getVariableType().equals(VariableType.GLOBAL)){
-                return StringVariableResult.error(config.getString("messages.variableSetInvalidTypeGlobal"),"variableSetInvalidTypeGlobal");
+        if (playerName != null) {
+            // The variable should be a PLAYER type.
+            if (variable.getVariableType().equals(VariableType.GLOBAL)) {
+                return StringVariableResult.error(config.getString("messages.variableSetInvalidTypeGlobal"), "variableSetInvalidTypeGlobal");
             }
 
-            // Check if player has joined the server.
+            // Check if the player has joined the server.
             serverVariablesPlayer = plugin.getPlayerVariablesManager().getPlayerByName(playerName);
-            if(serverVariablesPlayer == null){
-                return StringVariableResult.error(config.getString("messages.playerNoData"),"playerNoData");
+            if (serverVariablesPlayer == null) {
+                return StringVariableResult.error(config.getString("messages.playerNoData"), "playerNoData");
             }
 
             currentVariable = (ServerVariablesStringVariable) serverVariablesPlayer.getCurrentVariable(variableName);
-        }else{
-            // The variable should be GLOBAL type.
-            if(variable.getVariableType().equals(VariableType.PLAYER)){
-                return StringVariableResult.error(config.getString("messages.variableSetInvalidTypePlayer"),"variableSetInvalidTypePlayer");
+        } else {
+            // The variable should be a GLOBAL type.
+            if (variable.getVariableType().equals(VariableType.PLAYER)) {
+                return StringVariableResult.error(config.getString("messages.variableSetInvalidTypePlayer"), "variableSetInvalidTypePlayer");
             }
 
             currentVariable = (ServerVariablesStringVariable) serverVariablesManager.getCurrentVariable(variableName);
         }
 
         // Transformations
-        newValue = variablesManager.variableTransformations(variable,newValue);
+        newValue = variablesManager.variableTransformations(variable, newValue);
 
         String oldValue;
-        if(currentVariable == null){
+        if (currentVariable == null) {
             // The variable is not set. Get initial value.
             oldValue = variable.getInitialValue();
-        }else{
+        } else {
             oldValue = currentVariable.getCurrentValue();
         }
 
         // Update data
         Player player = null;
-        if(playerName != null){
-            if(plugin.getMySQLConnection() != null) {
-                plugin.getMySQLConnection().updateVariable(serverVariablesPlayer,variableName,newValue);
+        if (playerName != null) {
+            if (plugin.getMySQLConnection() != null) {
+                plugin.getMySQLConnection().updateVariable(serverVariablesPlayer, variableName, newValue);
             }
 
-            if(currentVariable == null){
-                serverVariablesPlayer.addVariable(new ServerVariablesStringVariable(variableName,newValue));
-            }else{
+            if (currentVariable == null) {
+                serverVariablesPlayer.addVariable(new ServerVariablesStringVariable(variableName, newValue));
+            } else {
                 currentVariable.setCurrentValue(newValue);
             }
             serverVariablesPlayer.setModified(true);
 
             player = Bukkit.getPlayer(serverVariablesPlayer.getName());
-        }else{
-            if(currentVariable == null){
-                serverVariablesManager.addVariable(new ServerVariablesStringVariable(variableName,newValue));
-            }else{
+        } else {
+            if (currentVariable == null) {
+                serverVariablesManager.addVariable(new ServerVariablesStringVariable(variableName, newValue));
+            } else {
                 currentVariable.setCurrentValue(newValue);
             }
         }
 
         plugin.getServer().getPluginManager().callEvent(
-                new StringVariableChangeEvent(player,variable,newValue,oldValue));
+                new StringVariableChangeEvent(player, variable, newValue, oldValue));
 
         return StringVariableResult.noErrors(newValue);
     }
 
-    public StringVariableResult modifyVariable(String playerName, String variableName, String value, boolean add){
+    public StringVariableResult modifyVariable(String playerName, String variableName, String value, boolean add) {
         FileConfiguration config = plugin.getConfigsManager().getMainConfigManager().getConfig();
 
         // Get current value
         StringVariableResult result;
-        if(playerName != null){
+        if (playerName != null) {
             // Player
             result = getVariableValue(playerName, variableName, true);
-        }else{
+        } else {
             // Global
-            result = getVariableValue(null, variableName,true);
+            result = getVariableValue(null, variableName, true);
         }
 
-        if(result.isError()){
-            return StringVariableResult.error(result.getErrorMessage(),result.getErrorKey());
+        if (result.isError()) {
+            return StringVariableResult.error(result.getErrorMessage(), result.getErrorKey());
         }
 
         //Value must be a number
-        if(!MathUtils.isParsable(value)){
-            return StringVariableResult.error(config.getString("messages.invalidValue"),"invalidValue");
+        if (!MathUtils.isParsable(value)) {
+            return StringVariableResult.error(config.getString("messages.invalidValue"), "invalidValue");
         }
 
         //ValueType must not be TEXT
         ValueType valueType = result.getVariable().getValueType();
-        if(valueType == ValueType.TEXT){
-            return add ? StringVariableResult.error(config.getString("messages.variableAddError"),"variableAddError") :
-                    StringVariableResult.error(config.getString("messages.variableReduceError"),"variableReduceError");
+        if (valueType == ValueType.TEXT) {
+            return add ? StringVariableResult.error(config.getString("messages.variableAddError"), "variableAddError") :
+                    StringVariableResult.error(config.getString("messages.variableReduceError"), "variableReduceError");
         }
 
-        try{
-            double newValue = MathUtils.getDoubleSum(value,result.getResultValue(),add);
-            if(value.contains(".") || valueType == ValueType.DOUBLE){
-                return setVariableValue(playerName,variableName,newValue+"");
-            }else{
-                return setVariableValue(playerName,variableName,((long)newValue)+"");
+        try {
+            double newValue = MathUtils.getDoubleSum(value, result.getResultValue(), add);
+            if (value.contains(".") || valueType == ValueType.DOUBLE) {
+                return setVariableValue(playerName, variableName, newValue + "");
+            } else {
+                return setVariableValue(playerName, variableName, ((long) newValue) + "");
             }
-        }catch(NumberFormatException e){
-            return add ? StringVariableResult.error(config.getString("messages.variableAddError"),"variableAddError") :
-                    StringVariableResult.error(config.getString("messages.variableReduceError"),"variableReduceError");
+        } catch (NumberFormatException e) {
+            return add ? StringVariableResult.error(config.getString("messages.variableAddError"), "variableAddError") :
+                    StringVariableResult.error(config.getString("messages.variableReduceError"), "variableReduceError");
         }
     }
 
-    public StringVariableResult resetVariable(String playerName, String variableName, boolean allPlayers){
+    public StringVariableResult resetVariable(String playerName, String variableName, boolean allPlayers) {
         FileConfiguration config = plugin.getConfigsManager().getMainConfigManager().getConfig();
 
         Variable aVariable = plugin.getVariablesManager().getVariable(variableName);
-        if(aVariable == null){
-            return StringVariableResult.error(config.getString("messages.variableDoesNotExists"),"variableDoesNotExists");
+        if (aVariable == null) {
+            return StringVariableResult.error(config.getString("messages.variableDoesNotExists"), "variableDoesNotExists");
         }
 
-        if(playerName != null || allPlayers){
-            // The variable should be PLAYER type.
-            if(aVariable.getVariableType().equals(VariableType.GLOBAL)){
-                return StringVariableResult.error(config.getString("messages.variableResetInvalidTypeGlobal"),"variableResetInvalidTypeGlobal");
+        if (playerName != null || allPlayers) {
+            // The variable should be a PLAYER type.
+            if (aVariable.getVariableType().equals(VariableType.GLOBAL)) {
+                return StringVariableResult.error(config.getString("messages.variableResetInvalidTypeGlobal"), "variableResetInvalidTypeGlobal");
             }
 
-            // Check if player has joined the server.
+            // Check if the player has joined the server.
             ServerVariablesPlayer serverVariablesPlayer = null;
-            if(!allPlayers){
+            if (!allPlayers) {
                 serverVariablesPlayer = plugin.getPlayerVariablesManager().getPlayerByName(playerName);
-                if(serverVariablesPlayer == null){
-                    return StringVariableResult.error(config.getString("messages.playerNoData"),"playerNoData");
+                if (serverVariablesPlayer == null) {
+                    return StringVariableResult.error(config.getString("messages.playerNoData"), "playerNoData");
                 }
             }
 
-            if(plugin.getMySQLConnection() != null) {
-                if(allPlayers){
-                    plugin.getMySQLConnection().resetVariable(null,variableName,true);
-                }else{
-                    plugin.getMySQLConnection().resetVariable(serverVariablesPlayer,variableName,false);
+            if (plugin.getMySQLConnection() != null) {
+                if (allPlayers) {
+                    plugin.getMySQLConnection().resetVariable(null, variableName, true);
+                } else {
+                    plugin.getMySQLConnection().resetVariable(serverVariablesPlayer, variableName, false);
                 }
             }
 
-            if(allPlayers){
-                Map<UUID,ServerVariablesPlayer> playerVariables = plugin.getPlayerVariablesManager().getPlayerVariables();
-                for(Map.Entry<UUID, ServerVariablesPlayer> entry : playerVariables.entrySet()){
+            if (allPlayers) {
+                Map<UUID, ServerVariablesPlayer> playerVariables = plugin.getPlayerVariablesManager().getPlayerVariables();
+                for (Map.Entry<UUID, ServerVariablesPlayer> entry : playerVariables.entrySet()) {
                     ServerVariablesPlayer p = entry.getValue();
                     ServerVariablesVariable removed = p.resetVariable(variableName);
-                    if(removed != null && p.getName() != null){
+                    if (removed != null && p.getName() != null) {
                         Player player = Bukkit.getPlayer(p.getName());
-                        if(player != null){
-                            if(aVariable.getValueType().equals(ValueType.LIST)){
+                        if (player != null) {
+                            if (aVariable.getValueType().equals(ValueType.LIST)) {
                                 ServerVariablesListVariable removedF = (ServerVariablesListVariable) removed;
                                 ListVariable variable = (ListVariable) aVariable;
                                 plugin.getServer().getPluginManager().callEvent(
-                                        new ListVariableChangeEvent(player,variable,variable.getInitialValue(),removedF.getCurrentValue(),-1));
-                            }else{
+                                        new ListVariableChangeEvent(player, variable, variable.getInitialValue(), removedF.getCurrentValue(), -1));
+                            } else {
                                 ServerVariablesStringVariable removedF = (ServerVariablesStringVariable) removed;
                                 StringVariable variable = (StringVariable) aVariable;
                                 plugin.getServer().getPluginManager().callEvent(
-                                        new StringVariableChangeEvent(player,variable,variable.getInitialValue(),removedF.getCurrentValue()));
+                                        new StringVariableChangeEvent(player, variable, variable.getInitialValue(), removedF.getCurrentValue()));
                             }
                         }
                     }
                 }
-            }else{
-                if(aVariable.getValueType().equals(ValueType.LIST)){
+            } else {
+                if (aVariable.getValueType().equals(ValueType.LIST)) {
                     ServerVariablesListVariable removed = (ServerVariablesListVariable) serverVariablesPlayer.resetVariable(variableName);
-                    if(removed != null){
+                    if (removed != null) {
                         ListVariable variable = (ListVariable) aVariable;
                         plugin.getServer().getPluginManager().callEvent(
-                                new ListVariableChangeEvent(Bukkit.getPlayer(playerName),variable,variable.getInitialValue(),removed.getCurrentValue(),-1));
+                                new ListVariableChangeEvent(Bukkit.getPlayer(playerName), variable, variable.getInitialValue(), removed.getCurrentValue(), -1));
                     }
-                }else{
+                } else {
                     ServerVariablesStringVariable removed = (ServerVariablesStringVariable) serverVariablesPlayer.resetVariable(variableName);
-                    if(removed != null){
+                    if (removed != null) {
                         StringVariable variable = (StringVariable) aVariable;
                         plugin.getServer().getPluginManager().callEvent(
-                                new StringVariableChangeEvent(Bukkit.getPlayer(playerName),variable,variable.getInitialValue(),removed.getCurrentValue()));
+                                new StringVariableChangeEvent(Bukkit.getPlayer(playerName), variable, variable.getInitialValue(), removed.getCurrentValue()));
                     }
                 }
             }
-        }else{
-            // The variable should be GLOBAL type.
-            if(aVariable.getVariableType().equals(VariableType.PLAYER)){
-                return StringVariableResult.error(config.getString("messages.variableResetInvalidTypePlayer"),"variableResetInvalidTypePlayer");
+        } else {
+            // The variable should be a GLOBAL type.
+            if (aVariable.getVariableType().equals(VariableType.PLAYER)) {
+                return StringVariableResult.error(config.getString("messages.variableResetInvalidTypePlayer"), "variableResetInvalidTypePlayer");
             }
 
-            if(aVariable.getValueType().equals(ValueType.LIST)){
+            if (aVariable.getValueType().equals(ValueType.LIST)) {
                 ServerVariablesListVariable removed = (ServerVariablesListVariable) plugin.getServerVariablesManager().getVariables().remove(variableName);
-                if(removed != null){
+                if (removed != null) {
                     ListVariable variable = (ListVariable) aVariable;
                     plugin.getServer().getPluginManager().callEvent(
-                            new ListVariableChangeEvent(null,variable,variable.getInitialValue(),removed.getCurrentValue(),-1));
+                            new ListVariableChangeEvent(null, variable, variable.getInitialValue(), removed.getCurrentValue(), -1));
                 }
-            }else{
+            } else {
                 ServerVariablesStringVariable removed = (ServerVariablesStringVariable) plugin.getServerVariablesManager().getVariables().remove(variableName);
-                if(removed != null){
+                if (removed != null) {
                     StringVariable variable = (StringVariable) aVariable;
                     plugin.getServer().getPluginManager().callEvent(
-                            new StringVariableChangeEvent(null,variable,variable.getInitialValue(),removed.getCurrentValue()));
+                            new StringVariableChangeEvent(null, variable, variable.getInitialValue(), removed.getCurrentValue()));
                 }
             }
         }
@@ -319,43 +321,43 @@ public StringVariableResult resetVariable(String playerName, String variableName
         return StringVariableResult.noErrors(null);
     }
 
-    public StringVariableResult checkVariableCommon(String variableName, String newValue){
+    public StringVariableResult checkVariableCommon(String variableName, String newValue) {
         FileConfiguration config = plugin.getConfigsManager().getMainConfigManager().getConfig();
         Variable variable = plugin.getVariablesManager().getVariable(variableName);
-        if(variable == null){
+        if (variable == null) {
             //Variable doesn't exist
-            return StringVariableResult.error(config.getString("messages.variableDoesNotExists"),"variableDoesNotExists");
+            return StringVariableResult.error(config.getString("messages.variableDoesNotExists"), "variableDoesNotExists");
         }
 
         //Check if newValue is valid
         ValueType type = variable.getValueType();
-        if(!ValueType.isValid(type,newValue)){
+        if (!ValueType.isValid(type, newValue)) {
             return StringVariableResult.error(config.getString("messages.variableInvalidValue")
-                    .replace("%value_type%",type.name()),"variableInvalidValue");
+                    .replace("%value_type%", type.name()), "variableInvalidValue");
         }
 
         //Check for possible values
         List<String> possibleRealValues = variable.getPossibleRealValues();
-        if(!possibleRealValues.isEmpty()){
+        if (!possibleRealValues.isEmpty()) {
             boolean isPossibleValue = false;
-            String possibleValuesText = "";
+            StringBuilder possibleValuesText = new StringBuilder();
 
-            for(int i=0;i<possibleRealValues.size();i++){
+            for (int i = 0; i < possibleRealValues.size(); i++) {
                 String possibleValue = possibleRealValues.get(i);
-                if(possibleValue.equals(newValue)){
+                if (possibleValue.equals(newValue)) {
                     isPossibleValue = true;
                     break;
                 }
-                if(i == possibleRealValues.size()-1){
-                    possibleValuesText = possibleValuesText+possibleValue;
-                }else{
-                    possibleValuesText = possibleValuesText+possibleValue+", ";
+                if (i == possibleRealValues.size() - 1) {
+                    possibleValuesText.append(possibleValue);
+                } else {
+                    possibleValuesText.append(possibleValue).append(", ");
                 }
 
             }
-            if(!isPossibleValue){
+            if (!isPossibleValue) {
                 return StringVariableResult.error(config.getString("messages.variableNotPossibleValue")
-                        .replace("%values%",possibleValuesText),"variableNotPossibleValue");
+                        .replace("%values%", possibleValuesText.toString()), "variableNotPossibleValue");
             }
         }
 
@@ -363,44 +365,44 @@ public StringVariableResult checkVariableCommon(String variableName, String newV
 
         //Check limitations
         Limitations limitations = variable.getLimitations();
-        if(variable.isNumerical()){
+        if (variable.isNumerical()) {
             double value = Double.parseDouble(newValue);
             String maxValue;
             String minValue;
-            if(variable.getValueType().equals(ValueType.DOUBLE)){
-                maxValue = limitations.getMaxValue()+"";
-                minValue = limitations.getMinValue()+"";
-            }else{
-                maxValue = (long)limitations.getMaxValue()+"";
-                minValue = (long)limitations.getMinValue()+"";
+            if (variable.getValueType().equals(ValueType.DOUBLE)) {
+                maxValue = limitations.getMaxValue() + "";
+                minValue = limitations.getMinValue() + "";
+            } else {
+                maxValue = (long) limitations.getMaxValue() + "";
+                minValue = (long) limitations.getMinValue() + "";
             }
-            if(value > limitations.getMaxValue()){
-                if(!limitations.isManageOutOfRange()){
+            if (value > limitations.getMaxValue()) {
+                if (!limitations.isManageOutOfRange()) {
                     return StringVariableResult.error(config.getString("messages.variableLimitationOutOfRangeMax")
-                            .replace("%value%",maxValue),"variableLimitationOutOfRangeMax");
+                            .replace("%value%", maxValue), "variableLimitationOutOfRangeMax");
                 }
                 resultValue = maxValue;
             }
-            if(value < limitations.getMinValue()){
-                if(!limitations.isManageOutOfRange()){
+            if (value < limitations.getMinValue()) {
+                if (!limitations.isManageOutOfRange()) {
                     return StringVariableResult.error(config.getString("messages.variableLimitationOutOfRangeMin")
-                            .replace("%value%",minValue),"variableLimitationOutOfRangeMin");
+                            .replace("%value%", minValue), "variableLimitationOutOfRangeMin");
                 }
                 resultValue = minValue;
             }
-        }else{
+        } else {
             int maxCharacters = limitations.getMaxCharacters();
-            if(newValue.length() > maxCharacters){
+            if (newValue.length() > maxCharacters) {
                 return StringVariableResult.error(config.getString("messages.variableLimitationMaxCharactersError")
-                        .replace("%value%",maxCharacters+""),"variableLimitationMaxCharactersError");
+                        .replace("%value%", maxCharacters + ""), "variableLimitationMaxCharactersError");
             }
         }
 
-        return StringVariableResult.noErrorsWithVariable(resultValue,variable);
+        return StringVariableResult.noErrorsWithVariable(resultValue, variable);
     }
 
-    public String variableTransformations(Variable variable, String newValue){
-        if(!variable.getValueType().equals(ValueType.DOUBLE)){
+    public String variableTransformations(Variable variable, String newValue) {
+        if (!variable.getValueType().equals(ValueType.DOUBLE)) {
             return newValue;
         }
         int maxDecimals = variable.getLimitations().getMaxDecimals();
@@ -408,13 +410,13 @@ public String variableTransformations(Variable variable, String newValue){
         return new BigDecimal(newValue).setScale(maxDecimals, RoundingMode.HALF_UP).toString();
     }
 
-    public String getDisplayFromVariableValue(Variable variable,String value){
+    public String getDisplayFromVariableValue(Variable variable, String value) {
         List<String> possibleValues = variable.getPossibleValues();
 
-        for(String possibleValue : possibleValues){
+        for (String possibleValue : possibleValues) {
             String[] fullValue = possibleValue.split(";");
-            if(fullValue[0].equals(value)){
-                if(fullValue.length > 1){
+            if (fullValue[0].equals(value)) {
+                if (fullValue.length > 1) {
                     return fullValue[1];
                 }
             }
diff --git a/src/main/java/svar/ajneb97/managers/dependencies/Metrics.java b/src/main/java/svar/ajneb97/managers/dependencies/Metrics.java
index c7e08b6..3d5b20d 100644
--- a/src/main/java/svar/ajneb97/managers/dependencies/Metrics.java
+++ b/src/main/java/svar/ajneb97/managers/dependencies/Metrics.java
@@ -47,9 +47,9 @@ public class Metrics {
     /**
      * Creates a new Metrics instance.
      *
-     * @param plugin Your plugin instance.
+     * @param plugin    Your plugin instance.
      * @param serviceId The id of the service. It can be found at <a
-     *     href="https://bstats.org/what-is-my-plugin-id">What is my plugin id?</a>
+     *                  href="https://bstats.org/what-is-my-plugin-id">What is my plugin id?</a>
      */
     public Metrics(JavaPlugin plugin, int serviceId) {
         this.plugin = plugin;
@@ -101,7 +101,9 @@ public Metrics(JavaPlugin plugin, int serviceId) {
                         logResponseStatusText);
     }
 
-    /** Shuts down the underlying scheduler service. */
+    /**
+     * Shuts down the underlying scheduler service.
+     */
     public void shutdown() {
         metricsBase.shutdown();
     }
@@ -148,7 +150,9 @@ private int getPlayerAmount() {
 
     public static class MetricsBase {
 
-        /** The version of the Metrics class. */
+        /**
+         * The version of the Metrics class.
+         */
         public static final String METRICS_VERSION = "3.0.2";
 
         private static final String REPORT_URL = "https://bStats.org/api/v2/data/%s";
@@ -186,23 +190,23 @@ public static class MetricsBase {
         /**
          * Creates a new MetricsBase class instance.
          *
-         * @param platform The platform of the service.
-         * @param serviceId The id of the service.
-         * @param serverUuid The server uuid.
-         * @param enabled Whether or not data sending is enabled.
-         * @param appendPlatformDataConsumer A consumer that receives a {@code JsonObjectBuilder} and
-         *     appends all platform-specific data.
-         * @param appendServiceDataConsumer A consumer that receives a {@code JsonObjectBuilder} and
-         *     appends all service-specific data.
-         * @param submitTaskConsumer A consumer that takes a runnable with the submit task. This can be
-         *     used to delegate the data collection to a another thread to prevent errors caused by
-         *     concurrency. Can be {@code null}.
+         * @param platform                    The platform of the service.
+         * @param serviceId                   The id of the service.
+         * @param serverUuid                  The server uuid.
+         * @param enabled                     Whether or not data sending is enabled.
+         * @param appendPlatformDataConsumer  A consumer that receives a {@code JsonObjectBuilder} and
+         *                                    appends all platform-specific data.
+         * @param appendServiceDataConsumer   A consumer that receives a {@code JsonObjectBuilder} and
+         *                                    appends all service-specific data.
+         * @param submitTaskConsumer          A consumer that takes a runnable with the submit task. This can be
+         *                                    used to delegate the data collection to a another thread to prevent errors caused by
+         *                                    concurrency. Can be {@code null}.
          * @param checkServiceEnabledSupplier A supplier to check if the service is still enabled.
-         * @param errorLogger A consumer that accepts log message and an error.
-         * @param infoLogger A consumer that accepts info log messages.
-         * @param logErrors Whether or not errors should be logged.
-         * @param logSentData Whether or not the sent data should be logged.
-         * @param logResponseStatusText Whether or not the response status text should be logged.
+         * @param errorLogger                 A consumer that accepts log message and an error.
+         * @param infoLogger                  A consumer that accepts info log messages.
+         * @param logErrors                   Whether or not errors should be logged.
+         * @param logSentData                 Whether or not the sent data should be logged.
+         * @param logResponseStatusText       Whether or not the response status text should be logged.
          */
         public MetricsBase(
                 String platform,
@@ -346,7 +350,9 @@ private void sendData(JsonObjectBuilder.JsonObject data) throws Exception {
             }
         }
 
-        /** Checks that the class was properly relocated. */
+        /**
+         * Checks that the class was properly relocated.
+         */
         private void checkRelocation() {
             // You can use the property to disable the check in your test environment
             if (System.getProperty("bstats.relocatecheck") == null
@@ -354,9 +360,9 @@ private void checkRelocation() {
                 // Maven's Relocate is clever and changes strings, too. So we have to use this
                 // little "trick" ... :D
                 final String defaultPackage =
-                        new String(new byte[] {'o', 'r', 'g', '.', 'b', 's', 't', 'a', 't', 's'});
+                        new String(new byte[]{'o', 'r', 'g', '.', 'b', 's', 't', 'a', 't', 's'});
                 final String examplePackage =
-                        new String(new byte[] {'y', 'o', 'u', 'r', '.', 'p', 'a', 'c', 'k', 'a', 'g', 'e'});
+                        new String(new byte[]{'y', 'o', 'u', 'r', '.', 'p', 'a', 'c', 'k', 'a', 'g', 'e'});
                 // We want to make sure no one just copy & pastes the example and uses the wrong
                 // package names
                 if (MetricsBase.class.getPackage().getName().startsWith(defaultPackage)
@@ -391,7 +397,7 @@ public static class SimplePie extends CustomChart {
         /**
          * Class constructor.
          *
-         * @param chartId The id of the chart.
+         * @param chartId  The id of the chart.
          * @param callable The callable which is used to request the chart data.
          */
         public SimplePie(String chartId, Callable<String> callable) {
@@ -417,7 +423,7 @@ public static class MultiLineChart extends CustomChart {
         /**
          * Class constructor.
          *
-         * @param chartId The id of the chart.
+         * @param chartId  The id of the chart.
          * @param callable The callable which is used to request the chart data.
          */
         public MultiLineChart(String chartId, Callable<Map<String, Integer>> callable) {
@@ -457,7 +463,7 @@ public static class AdvancedPie extends CustomChart {
         /**
          * Class constructor.
          *
-         * @param chartId The id of the chart.
+         * @param chartId  The id of the chart.
          * @param callable The callable which is used to request the chart data.
          */
         public AdvancedPie(String chartId, Callable<Map<String, Integer>> callable) {
@@ -497,7 +503,7 @@ public static class SimpleBarChart extends CustomChart {
         /**
          * Class constructor.
          *
-         * @param chartId The id of the chart.
+         * @param chartId  The id of the chart.
          * @param callable The callable which is used to request the chart data.
          */
         public SimpleBarChart(String chartId, Callable<Map<String, Integer>> callable) {
@@ -514,7 +520,7 @@ protected JsonObjectBuilder.JsonObject getChartData() throws Exception {
                 return null;
             }
             for (Map.Entry<String, Integer> entry : map.entrySet()) {
-                valuesBuilder.appendField(entry.getKey(), new int[] {entry.getValue()});
+                valuesBuilder.appendField(entry.getKey(), new int[]{entry.getValue()});
             }
             return new JsonObjectBuilder().appendField("values", valuesBuilder.build()).build();
         }
@@ -527,7 +533,7 @@ public static class AdvancedBarChart extends CustomChart {
         /**
          * Class constructor.
          *
-         * @param chartId The id of the chart.
+         * @param chartId  The id of the chart.
          * @param callable The callable which is used to request the chart data.
          */
         public AdvancedBarChart(String chartId, Callable<Map<String, int[]>> callable) {
@@ -567,7 +573,7 @@ public static class DrilldownPie extends CustomChart {
         /**
          * Class constructor.
          *
-         * @param chartId The id of the chart.
+         * @param chartId  The id of the chart.
          * @param callable The callable which is used to request the chart data.
          */
         public DrilldownPie(String chartId, Callable<Map<String, Map<String, Integer>>> callable) {
@@ -645,7 +651,7 @@ public static class SingleLineChart extends CustomChart {
         /**
          * Class constructor.
          *
-         * @param chartId The id of the chart.
+         * @param chartId  The id of the chart.
          * @param callable The callable which is used to request the chart data.
          */
         public SingleLineChart(String chartId, Callable<Integer> callable) {
@@ -694,7 +700,7 @@ public JsonObjectBuilder appendNull(String key) {
         /**
          * Appends a string field to the JSON.
          *
-         * @param key The key of the field.
+         * @param key   The key of the field.
          * @param value The value of the field.
          * @return A reference to this object.
          */
@@ -709,7 +715,7 @@ public JsonObjectBuilder appendField(String key, String value) {
         /**
          * Appends an integer field to the JSON.
          *
-         * @param key The key of the field.
+         * @param key   The key of the field.
          * @param value The value of the field.
          * @return A reference to this object.
          */
@@ -721,7 +727,7 @@ public JsonObjectBuilder appendField(String key, int value) {
         /**
          * Appends an object to the JSON.
          *
-         * @param key The key of the field.
+         * @param key    The key of the field.
          * @param object The object.
          * @return A reference to this object.
          */
@@ -736,7 +742,7 @@ public JsonObjectBuilder appendField(String key, JsonObject object) {
         /**
          * Appends a string array to the JSON.
          *
-         * @param key The key of the field.
+         * @param key    The key of the field.
          * @param values The string array.
          * @return A reference to this object.
          */
@@ -755,7 +761,7 @@ public JsonObjectBuilder appendField(String key, String[] values) {
         /**
          * Appends an integer array to the JSON.
          *
-         * @param key The key of the field.
+         * @param key    The key of the field.
          * @param values The integer array.
          * @return A reference to this object.
          */
@@ -772,7 +778,7 @@ public JsonObjectBuilder appendField(String key, int[] values) {
         /**
          * Appends an object array to the JSON.
          *
-         * @param key The key of the field.
+         * @param key    The key of the field.
          * @param values The integer array.
          * @return A reference to this object.
          */
@@ -789,7 +795,7 @@ public JsonObjectBuilder appendField(String key, JsonObject[] values) {
         /**
          * Appends a field to the object.
          *
-         * @param key The key of the field.
+         * @param key          The key of the field.
          * @param escapedValue The escaped value of the field.
          */
         private void appendFieldUnescaped(String key, String escapedValue) {
diff --git a/src/main/java/svar/ajneb97/model/ListVariableResult.java b/src/main/java/svar/ajneb97/model/ListVariableResult.java
index c06298c..09beb88 100644
--- a/src/main/java/svar/ajneb97/model/ListVariableResult.java
+++ b/src/main/java/svar/ajneb97/model/ListVariableResult.java
@@ -4,13 +4,14 @@
 
 import java.util.List;
 
-public class ListVariableResult extends VariableResult{
-    private List<String> resultValue;
+public class ListVariableResult extends VariableResult {
+
+    private final List<String> resultValue;
     private ServerVariablesListVariable currentVariable;
     private ServerVariablesPlayer serverVariablesPlayer;
 
     public ListVariableResult(boolean error, String errorMessage, List<String> resultValue, String errorKey) {
-        super(error,errorMessage,errorKey);
+        super(error, errorMessage, errorKey);
         this.resultValue = resultValue;
     }
 
@@ -18,32 +19,28 @@ public List<String> getResultValue() {
         return resultValue;
     }
 
-    public static ListVariableResult noErrors(List<String> resultValue){
-        return new ListVariableResult(false, null, resultValue,null);
-    }
-
-    public static ListVariableResult error(String errorMessage,String errorKey){
+    public static ListVariableResult error(String errorMessage, String errorKey) {
         return new ListVariableResult(true, errorMessage, null, errorKey);
     }
 
-    public static ListVariableResult noErrorsWithVariable(List<String> resultValue, Variable variable){
+    public static ListVariableResult noErrorsWithVariable(List<String> resultValue, Variable variable) {
         ListVariableResult variableResult = new ListVariableResult(false, null, resultValue, null);
         variableResult.setVariable(variable);
         return variableResult;
     }
 
-    public ListVariableResult withCurrentVariable(ServerVariablesListVariable currentVariable){
+    public ListVariableResult withCurrentVariable(ServerVariablesListVariable currentVariable) {
         this.currentVariable = currentVariable;
         return this;
     }
 
-    public ListVariableResult withServerVariablesPlayer(ServerVariablesPlayer serverVariablesPlayer){
+    public ListVariableResult withServerVariablesPlayer(ServerVariablesPlayer serverVariablesPlayer) {
         this.serverVariablesPlayer = serverVariablesPlayer;
         return this;
     }
 
-    public StringVariableResult toStringVariableResult(){
-        return new StringVariableResult(error,errorMessage,null,errorKey);
+    public StringVariableResult toStringVariableResult() {
+        return new StringVariableResult(error, errorMessage, null, errorKey);
     }
 
     public ServerVariablesListVariable getCurrentVariable() {
diff --git a/src/main/java/svar/ajneb97/model/ServerVariablesListVariable.java b/src/main/java/svar/ajneb97/model/ServerVariablesListVariable.java
index e49b99e..214f660 100644
--- a/src/main/java/svar/ajneb97/model/ServerVariablesListVariable.java
+++ b/src/main/java/svar/ajneb97/model/ServerVariablesListVariable.java
@@ -2,7 +2,7 @@
 
 import java.util.List;
 
-public class ServerVariablesListVariable extends ServerVariablesVariable{
+public class ServerVariablesListVariable extends ServerVariablesVariable {
 
     private List<String> currentValue;
 
diff --git a/src/main/java/svar/ajneb97/model/ServerVariablesPlayer.java b/src/main/java/svar/ajneb97/model/ServerVariablesPlayer.java
index dfc70a9..5600893 100644
--- a/src/main/java/svar/ajneb97/model/ServerVariablesPlayer.java
+++ b/src/main/java/svar/ajneb97/model/ServerVariablesPlayer.java
@@ -1,22 +1,16 @@
 package svar.ajneb97.model;
 
-import org.bukkit.Bukkit;
-import svar.ajneb97.model.structure.ListVariable;
-import svar.ajneb97.model.structure.StringVariable;
-import svar.ajneb97.model.structure.Variable;
-
-import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
 public class ServerVariablesPlayer {
 
-    private UUID uuid;
+    private final UUID uuid;
     private String name;
-    private Map<String,ServerVariablesVariable> variables;
+    private Map<String, ServerVariablesVariable> variables;
     private boolean modified;
 
-    public ServerVariablesPlayer(UUID uuid, String name, Map<String,ServerVariablesVariable> variables) {
+    public ServerVariablesPlayer(UUID uuid, String name, Map<String, ServerVariablesVariable> variables) {
         this.uuid = uuid;
         this.name = name;
         this.variables = variables;
@@ -35,10 +29,6 @@ public UUID getUuid() {
         return uuid;
     }
 
-    public void setUuid(UUID uuid) {
-        this.uuid = uuid;
-    }
-
     public String getName() {
         return name;
     }
@@ -55,64 +45,18 @@ public void setVariables(Map<String, ServerVariablesVariable> variables) {
         this.variables = variables;
     }
 
-    public void addVariable(ServerVariablesVariable variable){
-        variables.put(variable.getVariableName(),variable);
+    public void addVariable(ServerVariablesVariable variable) {
+        variables.put(variable.getVariableName(), variable);
     }
 
-    public ServerVariablesVariable getCurrentVariable(String variableName){
+    public ServerVariablesVariable getCurrentVariable(String variableName) {
         return variables.get(variableName);
     }
 
-    public String getVariableStringValue(String variableName, StringVariable variable){
-        ServerVariablesStringVariable v = (ServerVariablesStringVariable) getCurrentVariable(variableName);
-        if(v == null){
-            return variable.getInitialValue();
-        }
-        return v.getCurrentValue();
-    }
-
-    public List<String> getVariableListValue(String variableName, ListVariable variable){
-        ServerVariablesListVariable v = (ServerVariablesListVariable) getCurrentVariable(variableName);
-        if(v == null){
-            return variable.getInitialValue();
-        }
-        return v.getCurrentValue();
-    }
-
-    public Object getVariableValue(String variableName, Variable variable){
-        ServerVariablesVariable v = getCurrentVariable(variableName);
-        if(v == null){
-            return variable.getInitialValue();
-        }
-        return v.getCurrentValue();
-    }
-
-    public void setVariableString(String variableName,String newValue){
-        ServerVariablesStringVariable v = (ServerVariablesStringVariable) getCurrentVariable(variableName);
-        if(v == null){
-            v = new ServerVariablesStringVariable(variableName,newValue);
-            variables.put(v.getVariableName(),v);
-        }else{
-            v.setCurrentValue(newValue);
-        }
-        modified = true;
-    }
-
-    public void setVariableList(String variableName,String newValue){
-        ServerVariablesStringVariable v = (ServerVariablesStringVariable) getCurrentVariable(variableName);
-        if(v == null){
-            v = new ServerVariablesStringVariable(variableName,newValue);
-            variables.put(v.getVariableName(),v);
-        }else{
-            v.setCurrentValue(newValue);
-        }
-        modified = true;
-    }
-
-    public ServerVariablesVariable resetVariable(String variableName){
+    public ServerVariablesVariable resetVariable(String variableName) {
         ServerVariablesVariable removed = variables.remove(variableName);
 
-        if(removed != null){
+        if (removed != null) {
             modified = true;
         }
         return removed;
diff --git a/src/main/java/svar/ajneb97/model/ServerVariablesStringVariable.java b/src/main/java/svar/ajneb97/model/ServerVariablesStringVariable.java
index 6bd8bb0..56d7ad8 100644
--- a/src/main/java/svar/ajneb97/model/ServerVariablesStringVariable.java
+++ b/src/main/java/svar/ajneb97/model/ServerVariablesStringVariable.java
@@ -1,6 +1,6 @@
 package svar.ajneb97.model;
 
-public class ServerVariablesStringVariable extends ServerVariablesVariable{
+public class ServerVariablesStringVariable extends ServerVariablesVariable {
 
     private String currentValue;
 
diff --git a/src/main/java/svar/ajneb97/model/ServerVariablesVariable.java b/src/main/java/svar/ajneb97/model/ServerVariablesVariable.java
index d5816a7..9cb819c 100644
--- a/src/main/java/svar/ajneb97/model/ServerVariablesVariable.java
+++ b/src/main/java/svar/ajneb97/model/ServerVariablesVariable.java
@@ -1,6 +1,7 @@
 package svar.ajneb97.model;
 
 public abstract class ServerVariablesVariable {
+
     private String variableName;
 
     public ServerVariablesVariable(String variableName) {
diff --git a/src/main/java/svar/ajneb97/model/StringVariableResult.java b/src/main/java/svar/ajneb97/model/StringVariableResult.java
index d40f589..a10102e 100644
--- a/src/main/java/svar/ajneb97/model/StringVariableResult.java
+++ b/src/main/java/svar/ajneb97/model/StringVariableResult.java
@@ -2,12 +2,13 @@
 
 import svar.ajneb97.model.structure.Variable;
 
-public class StringVariableResult extends VariableResult{
-    private String resultValue;
-    private int index; // To return index of a list where a value is found.
+public class StringVariableResult extends VariableResult {
+
+    private final String resultValue;
+    private int index;
 
     public StringVariableResult(boolean error, String errorMessage, String resultValue, String errorKey) {
-        super(error,errorMessage,errorKey);
+        super(error, errorMessage, errorKey);
         this.resultValue = resultValue;
     }
 
@@ -24,15 +25,15 @@ public StringVariableResult withIndex(int index) {
         return this;
     }
 
-    public static StringVariableResult noErrors(String resultValue){
+    public static StringVariableResult noErrors(String resultValue) {
         return new StringVariableResult(false, null, resultValue, null);
     }
 
-    public static StringVariableResult error(String errorMessage,String errorKey){
+    public static StringVariableResult error(String errorMessage, String errorKey) {
         return new StringVariableResult(true, errorMessage, null, errorKey);
     }
 
-    public static StringVariableResult noErrorsWithVariable(String resultValue, Variable variable){
+    public static StringVariableResult noErrorsWithVariable(String resultValue, Variable variable) {
         StringVariableResult variableResult = new StringVariableResult(false, null, resultValue, null);
         variableResult.setVariable(variable);
         return variableResult;
diff --git a/src/main/java/svar/ajneb97/model/VariableResult.java b/src/main/java/svar/ajneb97/model/VariableResult.java
index 316800f..c531920 100644
--- a/src/main/java/svar/ajneb97/model/VariableResult.java
+++ b/src/main/java/svar/ajneb97/model/VariableResult.java
@@ -3,10 +3,11 @@
 import svar.ajneb97.model.structure.Variable;
 
 public abstract class VariableResult {
+
     protected boolean error;
     protected String errorMessage;
     protected String errorKey;
-    protected Variable variable; //Not always present
+    protected Variable variable;
 
     public VariableResult(boolean error, String errorMessage, String errorKey) {
         this.error = error;
@@ -18,18 +19,10 @@ public boolean isError() {
         return error;
     }
 
-    public void setError(boolean error) {
-        this.error = error;
-    }
-
     public String getErrorMessage() {
         return errorMessage;
     }
 
-    public void setErrorMessage(String errorMessage) {
-        this.errorMessage = errorMessage;
-    }
-
     public Variable getVariable() {
         return variable;
     }
diff --git a/src/main/java/svar/ajneb97/model/internal/UpdateCheckerResult.java b/src/main/java/svar/ajneb97/model/internal/UpdateCheckerResult.java
index dba3582..1556d80 100644
--- a/src/main/java/svar/ajneb97/model/internal/UpdateCheckerResult.java
+++ b/src/main/java/svar/ajneb97/model/internal/UpdateCheckerResult.java
@@ -2,10 +2,10 @@
 
 public class UpdateCheckerResult {
 
-    private String latestVersion;
-    private boolean error;
+    private final String latestVersion;
+    private final boolean error;
 
-    public UpdateCheckerResult(String latestVersion, boolean error){
+    public UpdateCheckerResult(String latestVersion, boolean error) {
         this.latestVersion = latestVersion;
         this.error = error;
     }
@@ -18,11 +18,11 @@ public boolean isError() {
         return error;
     }
 
-    public static UpdateCheckerResult noErrors(String latestVersion){
-        return new UpdateCheckerResult(latestVersion,false);
+    public static UpdateCheckerResult noErrors(String latestVersion) {
+        return new UpdateCheckerResult(latestVersion, false);
     }
 
-    public static UpdateCheckerResult error(){
-        return new UpdateCheckerResult(null,true);
+    public static UpdateCheckerResult error() {
+        return new UpdateCheckerResult(null, true);
     }
 }
diff --git a/src/main/java/svar/ajneb97/model/internal/ValueFromArgumentResult.java b/src/main/java/svar/ajneb97/model/internal/ValueFromArgumentResult.java
index 3f4c7c6..11c12c5 100644
--- a/src/main/java/svar/ajneb97/model/internal/ValueFromArgumentResult.java
+++ b/src/main/java/svar/ajneb97/model/internal/ValueFromArgumentResult.java
@@ -1,8 +1,9 @@
 package svar.ajneb97.model.internal;
 
 public class ValueFromArgumentResult {
-    private String finalValue;
-    private int extraArgs;
+
+    private final String finalValue;
+    private final int extraArgs;
 
     public ValueFromArgumentResult(String finalValue, int extraArgs) {
         this.finalValue = finalValue;
@@ -13,15 +14,7 @@ public String getFinalValue() {
         return finalValue;
     }
 
-    public void setFinalValue(String finalValue) {
-        this.finalValue = finalValue;
-    }
-
     public int getExtraArgs() {
         return extraArgs;
     }
-
-    public void setExtraArgs(int extraArgs) {
-        this.extraArgs = extraArgs;
-    }
 }
diff --git a/src/main/java/svar/ajneb97/model/structure/Limitations.java b/src/main/java/svar/ajneb97/model/structure/Limitations.java
index 4908fa3..5bebf4d 100644
--- a/src/main/java/svar/ajneb97/model/structure/Limitations.java
+++ b/src/main/java/svar/ajneb97/model/structure/Limitations.java
@@ -1,6 +1,7 @@
 package svar.ajneb97.model.structure;
 
 public class Limitations {
+
     private double minValue;
     private double maxValue;
     private int maxCharacters;
@@ -47,6 +48,7 @@ public void setMaxDecimals(int maxDecimals) {
         this.maxDecimals = maxDecimals;
     }
 
+    @SuppressWarnings("BooleanMethodIsAlwaysInverted")
     public boolean isManageOutOfRange() {
         return manageOutOfRange;
     }
diff --git a/src/main/java/svar/ajneb97/model/structure/ListVariable.java b/src/main/java/svar/ajneb97/model/structure/ListVariable.java
index e833752..8039510 100644
--- a/src/main/java/svar/ajneb97/model/structure/ListVariable.java
+++ b/src/main/java/svar/ajneb97/model/structure/ListVariable.java
@@ -2,9 +2,10 @@
 
 import java.util.List;
 
-public class ListVariable extends Variable{
+public class ListVariable extends Variable {
 
     private List<String> initialValue;
+
     public ListVariable(String name, VariableType variableType, ValueType valueType, List<String> possibleValues, Limitations limitations,
                         List<String> initialValue) {
         super(name, variableType, valueType, possibleValues, limitations);
diff --git a/src/main/java/svar/ajneb97/model/structure/StringVariable.java b/src/main/java/svar/ajneb97/model/structure/StringVariable.java
index 73a7a72..b4c9d79 100644
--- a/src/main/java/svar/ajneb97/model/structure/StringVariable.java
+++ b/src/main/java/svar/ajneb97/model/structure/StringVariable.java
@@ -2,8 +2,9 @@
 
 import java.util.List;
 
-public class StringVariable extends Variable{
-    private String initialValue;
+public class StringVariable extends Variable {
+
+    private final String initialValue;
 
     public StringVariable(String name, VariableType variableType, ValueType valueType, List<String> possibleValues, Limitations limitations,
                           String initialValue) {
@@ -15,7 +16,4 @@ public String getInitialValue() {
         return initialValue;
     }
 
-    public void setInitialValue(String initialValue) {
-        this.initialValue = initialValue;
-    }
 }
diff --git a/src/main/java/svar/ajneb97/model/structure/ValueType.java b/src/main/java/svar/ajneb97/model/structure/ValueType.java
index f15513d..7c49fc6 100644
--- a/src/main/java/svar/ajneb97/model/structure/ValueType.java
+++ b/src/main/java/svar/ajneb97/model/structure/ValueType.java
@@ -1,22 +1,26 @@
 package svar.ajneb97.model.structure;
 
 public enum ValueType {
+
     TEXT,
+
     INTEGER,
+
     DOUBLE,
+
     LIST;
 
-    public static boolean isValid(ValueType type,String currentValue){
-        if(type.equals(ValueType.INTEGER)){
-            try{
+    public static boolean isValid(ValueType type, String currentValue) {
+        if (type.equals(ValueType.INTEGER)) {
+            try {
                 Long.parseLong(currentValue);
-            }catch(Exception e){
+            } catch (Exception e) {
                 return false;
             }
-        }else if(type.equals(ValueType.DOUBLE)){
-            try{
+        } else if (type.equals(ValueType.DOUBLE)) {
+            try {
                 Double.parseDouble(currentValue);
-            }catch(Exception e){
+            } catch (Exception e) {
                 return false;
             }
         }
diff --git a/src/main/java/svar/ajneb97/model/structure/Variable.java b/src/main/java/svar/ajneb97/model/structure/Variable.java
index 46416d0..fde2ce1 100644
--- a/src/main/java/svar/ajneb97/model/structure/Variable.java
+++ b/src/main/java/svar/ajneb97/model/structure/Variable.java
@@ -5,13 +5,13 @@
 
 public abstract class Variable {
 
-    private String name;
-    private VariableType variableType;
-    private ValueType valueType;
-    private List<String> possibleValues;
-    private Limitations limitations;
+    private final String name;
+    private final VariableType variableType;
+    private final ValueType valueType;
+    private final List<String> possibleValues;
+    private final Limitations limitations;
 
-    public Variable(String name,VariableType variableType, ValueType valueType, List<String> possibleValues,Limitations limitations) {
+    public Variable(String name, VariableType variableType, ValueType valueType, List<String> possibleValues, Limitations limitations) {
         this.name = name;
         this.variableType = variableType;
         this.valueType = valueType;
@@ -23,32 +23,23 @@ public String getName() {
         return name;
     }
 
-    public void setName(String name) {
-        this.name = name;
-    }
-
     public VariableType getVariableType() {
         return variableType;
     }
 
-    public void setVariableType(VariableType variableType) {
-        this.variableType = variableType;
-    }
 
     public ValueType getValueType() {
         return valueType;
     }
 
-    public void setValueType(ValueType valueType) {
-        this.valueType = valueType;
-    }
 
-    public List<String> getPossibleValues(){
+    public List<String> getPossibleValues() {
         return possibleValues;
     }
-    public List<String> getPossibleRealValues(){
+
+    public List<String> getPossibleRealValues() {
         List<String> list = new ArrayList<>();
-        for(String value : possibleValues){
+        for (String value : possibleValues) {
             String realValue = value.split(";")[0];
             list.add(realValue);
         }
@@ -59,11 +50,7 @@ public Limitations getLimitations() {
         return limitations;
     }
 
-    public void setLimitations(Limitations limitations) {
-        this.limitations = limitations;
-    }
-
-    public boolean isNumerical(){
+    public boolean isNumerical() {
         return valueType.equals(ValueType.INTEGER) || valueType.equals(ValueType.DOUBLE);
     }
 
diff --git a/src/main/java/svar/ajneb97/model/structure/VariableType.java b/src/main/java/svar/ajneb97/model/structure/VariableType.java
index 255bd53..742c8f3 100644
--- a/src/main/java/svar/ajneb97/model/structure/VariableType.java
+++ b/src/main/java/svar/ajneb97/model/structure/VariableType.java
@@ -1,6 +1,8 @@
 package svar.ajneb97.model.structure;
 
 public enum VariableType {
+
     GLOBAL,
+
     PLAYER
 }
diff --git a/src/main/java/svar/ajneb97/tasks/DataSaveTask.java b/src/main/java/svar/ajneb97/tasks/DataSaveTask.java
index 504e5cf..f2f3b5a 100644
--- a/src/main/java/svar/ajneb97/tasks/DataSaveTask.java
+++ b/src/main/java/svar/ajneb97/tasks/DataSaveTask.java
@@ -1,39 +1,52 @@
 package svar.ajneb97.tasks;
 
-import org.bukkit.scheduler.BukkitRunnable;
+import io.papermc.paper.threadedregions.scheduler.ScheduledTask;
+import org.bukkit.scheduler.BukkitTask;
 import svar.ajneb97.ServerVariables;
 
 public class DataSaveTask {
 
-	private ServerVariables plugin;
-	private boolean end;
-	public DataSaveTask(ServerVariables plugin) {
-		this.plugin = plugin;
-		this.end = false;
-	}
-	
-	public void end() {
-		end = true;
-	}
-	
-	public void start(int minutes) {
-		long ticks = minutes*60*20;
-		
-		new BukkitRunnable() {
-			@Override
-			public void run() {
-				if(end) {
-					this.cancel();
-				}else {
-					execute();
-				}
-			}
-			
-		}.runTaskTimerAsynchronously(plugin, 0L, ticks);
-	}
-	
-	public void execute() {
-		plugin.getConfigsManager().saveServerData();
-		plugin.getConfigsManager().savePlayerData();
-	}
+    private final ServerVariables plugin;
+    private final boolean isFolia;
+    private Runnable cancel;
+
+    public DataSaveTask(ServerVariables plugin) {
+        this.plugin = plugin;
+        this.isFolia = plugin.isFolia;
+    }
+
+    public void start(int minutes) {
+        long period = minutes * 60L * 20L;
+
+        Runnable runnable = this::execute;
+
+        if (isFolia) {
+            ScheduledTask task = plugin.getServer().getGlobalRegionScheduler().runAtFixedRate(
+                    plugin,
+                    t -> runnable.run(),
+                    period,
+                    period
+            );
+            cancel = task::cancel;
+        } else {
+            BukkitTask task = plugin.getServer().getScheduler().runTaskTimerAsynchronously(
+                    plugin,
+                    runnable,
+                    period,
+                    period
+            );
+            cancel = task::cancel;
+        }
+    }
+
+    public void stop() {
+        if (cancel != null) {
+            cancel.run();
+        }
+    }
+
+    public void execute() {
+        plugin.getConfigsManager().saveServerData();
+        plugin.getConfigsManager().savePlayerData();
+    }
 }
diff --git a/src/main/java/svar/ajneb97/utils/MathUtils.java b/src/main/java/svar/ajneb97/utils/MathUtils.java
index aebdddc..a46fbfa 100644
--- a/src/main/java/svar/ajneb97/utils/MathUtils.java
+++ b/src/main/java/svar/ajneb97/utils/MathUtils.java
@@ -2,9 +2,9 @@
 
 public class MathUtils {
 
-    public static double getDoubleSum(String value1,String value2,boolean add){
+    public static double getDoubleSum(String value1, String value2, boolean add) {
         double numericValue = Double.parseDouble(value1);
-        return add ? Double.parseDouble(value2)+numericValue : Double.parseDouble(value2)-numericValue;
+        return add ? Double.parseDouble(value2) + numericValue : Double.parseDouble(value2) - numericValue;
     }
 
     // org.apache.commons.lang3.math.NumberUtils
@@ -14,7 +14,7 @@ public static boolean isParsable(String str) {
         } else if (str.charAt(str.length() - 1) == '.') {
             return false;
         } else if (str.charAt(0) == '-') {
-            return str.length() == 1 ? false : withDecimalsParsing(str, 1);
+            return str.length() != 1 && withDecimalsParsing(str, 1);
         } else {
             return withDecimalsParsing(str, 0);
         }
@@ -24,7 +24,7 @@ public static boolean isParsable(String str) {
     private static boolean withDecimalsParsing(String str, int beginIdx) {
         int decimalPoints = 0;
 
-        for(int i = beginIdx; i < str.length(); ++i) {
+        for (int i = beginIdx; i < str.length(); ++i) {
             boolean isDecimalPoint = str.charAt(i) == '.';
             if (isDecimalPoint) {
                 ++decimalPoints;
diff --git a/src/main/java/svar/ajneb97/utils/OtherUtils.java b/src/main/java/svar/ajneb97/utils/OtherUtils.java
index e50e875..11317a5 100644
--- a/src/main/java/svar/ajneb97/utils/OtherUtils.java
+++ b/src/main/java/svar/ajneb97/utils/OtherUtils.java
@@ -7,42 +7,30 @@ public class OtherUtils {
 
     public static boolean isNew() {
         ServerVersion serverVersion = ServerVariables.serverVersion;
-        if(serverVersion.serverVersionGreaterEqualThan(serverVersion,ServerVersion.v1_16_R1)){
-            return true;
-        }
-        return false;
-    }
-
-    public static String getFileExtension(String filePath) {
-        int lastIndex = filePath.lastIndexOf(".");
-        if (lastIndex > 0 && lastIndex < filePath.length() - 1) {
-            return filePath.substring(lastIndex+1);
-        } else {
-            return "invalid";
-        }
+        return serverVersion.serverVersionGreaterEqualThan(serverVersion, ServerVersion.v1_16_R1);
     }
 
-    public static ValueFromArgumentResult getValueFromArgument(String[] args, int startArg){
+    public static ValueFromArgumentResult getValueFromArgument(String[] args, int startArg) {
         String value = args[startArg];
         int valueExtraArgs = 0;
-        if(value.startsWith("\"")){
-            String newValueWithSpaces = value; // "value with spaces"
-            for(int i=startArg+1;i<args.length;i++){
+        if (value.startsWith("\"")) {
+            StringBuilder newValueWithSpaces = new StringBuilder(value); // "value with spaces"
+            for (int i = startArg + 1; i < args.length; i++) {
                 String arg = args[i];
-                newValueWithSpaces=newValueWithSpaces+" "+arg;
+                newValueWithSpaces.append(" ").append(arg);
                 valueExtraArgs++;
-                if(arg.endsWith("\"")){
+                if (arg.endsWith("\"")) {
                     break;
                 }
             }
 
-            if(!newValueWithSpaces.startsWith("\"") || !newValueWithSpaces.endsWith("\"")){
+            if (!newValueWithSpaces.toString().startsWith("\"") || !newValueWithSpaces.toString().endsWith("\"")) {
                 return null;
             }
 
-            value = newValueWithSpaces.replace("\"","");
+            value = newValueWithSpaces.toString().replace("\"", "");
         }
 
-        return new ValueFromArgumentResult(value,valueExtraArgs);
+        return new ValueFromArgumentResult(value, valueExtraArgs);
     }
 }
diff --git a/src/main/java/svar/ajneb97/utils/ServerVersion.java b/src/main/java/svar/ajneb97/utils/ServerVersion.java
index 2c55164..d5ece7f 100644
--- a/src/main/java/svar/ajneb97/utils/ServerVersion.java
+++ b/src/main/java/svar/ajneb97/utils/ServerVersion.java
@@ -1,6 +1,7 @@
 package svar.ajneb97.utils;
 
 public enum ServerVersion {
+
     v1_8_R1,
     v1_8_R2,
     v1_8_R3,
@@ -34,7 +35,7 @@ public enum ServerVersion {
     v1_21_R6,
     v1_21_R7;
 
-    public boolean serverVersionGreaterEqualThan(ServerVersion version1,ServerVersion version2){
+    public boolean serverVersionGreaterEqualThan(ServerVersion version1, ServerVersion version2) {
         return version1.ordinal() >= version2.ordinal();
     }
 }
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 32842ae..1f85e31 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -3,6 +3,7 @@ version: ${project.version}
 name: ServerVariables
 api-version: 1.13
 softdepend: [PlaceholderAPI]
+folia-supported: true
 
 commands:
   servervariables: