diff --git a/src/main/java/me/chayapak1/chomens_bot/Bot.java b/src/main/java/me/chayapak1/chomens_bot/Bot.java
index 23c625c5..81547f90 100644
--- a/src/main/java/me/chayapak1/chomens_bot/Bot.java
+++ b/src/main/java/me/chayapak1/chomens_bot/Bot.java
@@ -66,8 +66,8 @@ public class Bot extends SessionAdapter {
     public boolean loggedIn = false;
     public long loginTime;
 
-    public final ExecutorService executorService = Main.executorService;
-    public final ScheduledExecutorService executor = Main.executor;
+    public final ExecutorService executorService = Main.EXECUTOR_SERVICE;
+    public final ScheduledExecutorService executor = Main.EXECUTOR;
 
     public LoggerPlugin logger;
     public TickPlugin tick;
diff --git a/src/main/java/me/chayapak1/chomens_bot/Main.java b/src/main/java/me/chayapak1/chomens_bot/Main.java
index e1c0b58e..6f9e8f5b 100644
--- a/src/main/java/me/chayapak1/chomens_bot/Main.java
+++ b/src/main/java/me/chayapak1/chomens_bot/Main.java
@@ -26,11 +26,11 @@ public class Main {
 
     public static final List<Bot> bots = new ArrayList<>();
 
-    public static final ExecutorService executorService = Executors.newFixedThreadPool(
+    public static final ExecutorService EXECUTOR_SERVICE = Executors.newFixedThreadPool(
             Math.max(1, Runtime.getRuntime().availableProcessors() / 2),
             new ThreadFactoryBuilder().setNameFormat("ExecutorService #%d").build()
     );
-    public static final ScheduledExecutorService executor = Executors.newScheduledThreadPool(
+    public static final ScheduledExecutorService EXECUTOR = Executors.newScheduledThreadPool(
             Math.max(1, Runtime.getRuntime().availableProcessors() / 2),
             new ThreadFactoryBuilder().setNameFormat("ScheduledExecutorService #%d").build()
     );
@@ -89,7 +89,7 @@ public class Main {
         if (!config.backup.enabled) {
             initializeBots();
         } else {
-            executor.scheduleAtFixedRate(() -> {
+            EXECUTOR.scheduleAtFixedRate(() -> {
                 boolean reachable;
 
                 try {
@@ -181,9 +181,9 @@ public class Main {
 
         LoggerUtilities.log(stoppingMessage);
 
-        executor.shutdown();
+        EXECUTOR.shutdown();
 
-        executorService.shutdown();
+        EXECUTOR_SERVICE.shutdown();
 
         if (database != null) database.stop();
 
diff --git a/src/main/java/me/chayapak1/chomens_bot/commands/FilterCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/FilterCommand.java
index 0a1faf0c..077ff4e5 100644
--- a/src/main/java/me/chayapak1/chomens_bot/commands/FilterCommand.java
+++ b/src/main/java/me/chayapak1/chomens_bot/commands/FilterCommand.java
@@ -78,7 +78,7 @@ public class FilterCommand extends Command {
                 final boolean finalRegex = regex;
                 final boolean finalIgnoreCase = ignoreCase;
 
-                DatabasePlugin.executorService.submit(() -> bot.playerFilter.add(player, reason, finalRegex, finalIgnoreCase));
+                DatabasePlugin.EXECUTOR_SERVICE.submit(() -> bot.playerFilter.add(player, reason, finalRegex, finalIgnoreCase));
 
                 if (reason.isEmpty()) {
                     return Component.translatable(
@@ -102,7 +102,7 @@ public class FilterCommand extends Command {
 
                 if (player == null) throw new CommandException(Component.text("Invalid index"));
 
-                DatabasePlugin.executorService.submit(() -> bot.playerFilter.remove(player.playerName));
+                DatabasePlugin.EXECUTOR_SERVICE.submit(() -> bot.playerFilter.remove(player.playerName));
 
                 return Component.translatable(
                         "Removed %s from the filters",
@@ -112,7 +112,7 @@ public class FilterCommand extends Command {
             case "clear" -> {
                 context.checkOverloadArgs(1);
 
-                DatabasePlugin.executorService.submit(() -> bot.playerFilter.clear());
+                DatabasePlugin.EXECUTOR_SERVICE.submit(() -> bot.playerFilter.clear());
                 return Component.text("Cleared the filter").color(ColorUtilities.getColorByString(bot.config.colorPalette.defaultColor));
             }
             case "list" -> {
diff --git a/src/main/java/me/chayapak1/chomens_bot/commands/IPFilterCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/IPFilterCommand.java
index 94d55642..154131c3 100644
--- a/src/main/java/me/chayapak1/chomens_bot/commands/IPFilterCommand.java
+++ b/src/main/java/me/chayapak1/chomens_bot/commands/IPFilterCommand.java
@@ -54,7 +54,7 @@ public class IPFilterCommand extends Command {
                     );
                 }
 
-                DatabasePlugin.executorService.submit(() -> bot.ipFilter.add(ip, reason));
+                DatabasePlugin.EXECUTOR_SERVICE.submit(() -> bot.ipFilter.add(ip, reason));
 
                 if (reason.isEmpty()) {
                     return Component.translatable(
@@ -78,7 +78,7 @@ public class IPFilterCommand extends Command {
 
                 if (targetIP == null) throw new CommandException(Component.text("Invalid index"));
 
-                DatabasePlugin.executorService.submit(() -> bot.ipFilter.remove(targetIP));
+                DatabasePlugin.EXECUTOR_SERVICE.submit(() -> bot.ipFilter.remove(targetIP));
 
                 return Component.translatable(
                         "Removed %s from the filters",
@@ -88,7 +88,7 @@ public class IPFilterCommand extends Command {
             case "clear" -> {
                 context.checkOverloadArgs(1);
 
-                DatabasePlugin.executorService.submit(() -> bot.ipFilter.clear());
+                DatabasePlugin.EXECUTOR_SERVICE.submit(() -> bot.ipFilter.clear());
                 return Component.text("Cleared the filter").color(ColorUtilities.getColorByString(bot.config.colorPalette.defaultColor));
             }
             case "list" -> {
diff --git a/src/main/java/me/chayapak1/chomens_bot/commands/MailCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/MailCommand.java
index abb85dab..d446bf41 100644
--- a/src/main/java/me/chayapak1/chomens_bot/commands/MailCommand.java
+++ b/src/main/java/me/chayapak1/chomens_bot/commands/MailCommand.java
@@ -51,7 +51,7 @@ public class MailCommand extends Command {
         final String action = context.getAction();
 
         switch (action) {
-            case "send" -> DatabasePlugin.executorService.submit(() -> {
+            case "send" -> DatabasePlugin.EXECUTOR_SERVICE.submit(() -> {
                 try {
                     bot.mail.send(
                             new Mail(
@@ -82,7 +82,7 @@ public class MailCommand extends Command {
                             throw new CommandException(Component.text("Player has no `message` NBT tag in their selected item's minecraft:custom_data"));
                         }
 
-                        DatabasePlugin.executorService.submit(() -> {
+                        DatabasePlugin.EXECUTOR_SERVICE.submit(() -> {
                             try {
                                 bot.mail.send(
                                         new Mail(
@@ -112,7 +112,7 @@ public class MailCommand extends Command {
             case "read" -> {
                 context.checkOverloadArgs(1);
 
-                DatabasePlugin.executorService.submit(() -> {
+                DatabasePlugin.EXECUTOR_SERVICE.submit(() -> {
                     final List<Mail> mails = bot.mail.list();
 
                     int senderMailSize = 0;
diff --git a/src/main/java/me/chayapak1/chomens_bot/commands/SeenCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/SeenCommand.java
index 9ab666ef..f4b78c3a 100644
--- a/src/main/java/me/chayapak1/chomens_bot/commands/SeenCommand.java
+++ b/src/main/java/me/chayapak1/chomens_bot/commands/SeenCommand.java
@@ -64,7 +64,7 @@ public class SeenCommand extends Command {
 
         if (online) return Component.join(JoinConfiguration.newlines(), onlineComponents);
 
-        DatabasePlugin.executorService.submit(() -> {
+        DatabasePlugin.EXECUTOR_SERVICE.submit(() -> {
             try {
                 final JsonNode playerElement = bot.playersDatabase.getPlayerData(player);
                 if (playerElement == null) throw new CommandException(Component.translatable(
diff --git a/src/main/java/me/chayapak1/chomens_bot/commands/UrbanCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/UrbanCommand.java
index d9182c59..68aca7f0 100644
--- a/src/main/java/me/chayapak1/chomens_bot/commands/UrbanCommand.java
+++ b/src/main/java/me/chayapak1/chomens_bot/commands/UrbanCommand.java
@@ -40,7 +40,7 @@ public class UrbanCommand extends Command {
                 false
         );
 
-        Main.executor.scheduleAtFixedRate(() -> requestsPerSecond = 0, 0, 1, TimeUnit.SECONDS);
+        Main.EXECUTOR.scheduleAtFixedRate(() -> requestsPerSecond = 0, 0, 1, TimeUnit.SECONDS);
     }
 
     public Component execute (CommandContext context) throws CommandException {
diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/DatabasePlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/DatabasePlugin.java
index 44b31b00..926aa3f5 100644
--- a/src/main/java/me/chayapak1/chomens_bot/plugins/DatabasePlugin.java
+++ b/src/main/java/me/chayapak1/chomens_bot/plugins/DatabasePlugin.java
@@ -12,7 +12,7 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.ThreadPoolExecutor;
 
 public class DatabasePlugin {
-    public static final ExecutorService executorService = Executors.newSingleThreadExecutor(
+    public static final ExecutorService EXECUTOR_SERVICE = Executors.newSingleThreadExecutor(
             new ThreadFactoryBuilder()
                     .setNameFormat("ExecutorService (database)")
                     .build()
@@ -33,7 +33,7 @@ public class DatabasePlugin {
     }
 
     public void checkOverloaded () throws CommandException {
-        final ThreadPoolExecutor threadPoolExecutor = (ThreadPoolExecutor) executorService;
+        final ThreadPoolExecutor threadPoolExecutor = (ThreadPoolExecutor) EXECUTOR_SERVICE;
 
         if (threadPoolExecutor.getQueue().size() > 20) throw new CommandException(
                 Component.text("The executor service is filled with requests!")
@@ -59,7 +59,7 @@ public class DatabasePlugin {
     }
 
     public void stop () {
-        executorService.shutdown();
+        EXECUTOR_SERVICE.shutdown();
 
         try {
             connection.close();
diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/IPFilterPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/IPFilterPlugin.java
index ae649e92..dda04b82 100644
--- a/src/main/java/me/chayapak1/chomens_bot/plugins/IPFilterPlugin.java
+++ b/src/main/java/me/chayapak1/chomens_bot/plugins/IPFilterPlugin.java
@@ -23,7 +23,7 @@ public class IPFilterPlugin implements PlayersPlugin.Listener, CorePlugin.Listen
 
     static {
         if (Main.database != null) {
-            DatabasePlugin.executorService.submit(() -> {
+            DatabasePlugin.EXECUTOR_SERVICE.submit(() -> {
                 try {
                     Main.database.execute(CREATE_TABLE);
                 } catch (SQLException e) {
@@ -31,7 +31,7 @@ public class IPFilterPlugin implements PlayersPlugin.Listener, CorePlugin.Listen
                 }
             });
 
-            Main.executor.scheduleAtFixedRate(IPFilterPlugin::list, 5, 30, TimeUnit.SECONDS);
+            Main.EXECUTOR.scheduleAtFixedRate(IPFilterPlugin::list, 5, 30, TimeUnit.SECONDS);
         }
     }
 
diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/IRCPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/IRCPlugin.java
index e8377401..17957cb8 100644
--- a/src/main/java/me/chayapak1/chomens_bot/plugins/IRCPlugin.java
+++ b/src/main/java/me/chayapak1/chomens_bot/plugins/IRCPlugin.java
@@ -85,7 +85,7 @@ public class IRCPlugin extends ListenerAdapter {
             });
         }
 
-        Main.executor.scheduleAtFixedRate(this::queueTick, 0, 100, TimeUnit.MILLISECONDS);
+        Main.EXECUTOR.scheduleAtFixedRate(this::queueTick, 0, 100, TimeUnit.MILLISECONDS);
     }
 
     @Override
diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/MailPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/MailPlugin.java
index c8b6a995..0137a309 100644
--- a/src/main/java/me/chayapak1/chomens_bot/plugins/MailPlugin.java
+++ b/src/main/java/me/chayapak1/chomens_bot/plugins/MailPlugin.java
@@ -23,7 +23,7 @@ public class MailPlugin implements PlayersPlugin.Listener {
 
     static {
         if (Main.database != null) {
-            DatabasePlugin.executorService.submit(() -> {
+            DatabasePlugin.EXECUTOR_SERVICE.submit(() -> {
                 try {
                     Main.database.execute(CREATE_TABLE);
                 } catch (SQLException e) {
@@ -45,7 +45,7 @@ public class MailPlugin implements PlayersPlugin.Listener {
 
     @Override
     public void playerJoined (PlayerEntry target) {
-        DatabasePlugin.executorService.submit(() -> {
+        DatabasePlugin.EXECUTOR_SERVICE.submit(() -> {
             final String name = target.profile.getName();
 
             int sendToTargetSize = 0;
diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/PlayerFilterPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/PlayerFilterPlugin.java
index 6e43588c..8a1f4160 100644
--- a/src/main/java/me/chayapak1/chomens_bot/plugins/PlayerFilterPlugin.java
+++ b/src/main/java/me/chayapak1/chomens_bot/plugins/PlayerFilterPlugin.java
@@ -27,7 +27,7 @@ public class PlayerFilterPlugin implements PlayersPlugin.Listener {
 
     static {
         if (Main.database != null) {
-            DatabasePlugin.executorService.submit(() -> {
+            DatabasePlugin.EXECUTOR_SERVICE.submit(() -> {
                 try {
                     Main.database.execute(CREATE_TABLE);
                 } catch (SQLException e) {
@@ -35,7 +35,7 @@ public class PlayerFilterPlugin implements PlayersPlugin.Listener {
                 }
             });
 
-            Main.executor.scheduleAtFixedRate(PlayerFilterPlugin::list, 5, 30, TimeUnit.SECONDS);
+            Main.EXECUTOR.scheduleAtFixedRate(PlayerFilterPlugin::list, 5, 30, TimeUnit.SECONDS);
         }
     }
 
diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersDatabasePlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersDatabasePlugin.java
index c3ed9f08..a6dde6ad 100644
--- a/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersDatabasePlugin.java
+++ b/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersDatabasePlugin.java
@@ -33,7 +33,7 @@ public class PlayersDatabasePlugin implements PlayersPlugin.Listener {
 
     static {
         if (Main.database != null) {
-            DatabasePlugin.executorService.submit(() -> {
+            DatabasePlugin.EXECUTOR_SERVICE.submit(() -> {
                 try {
                     Main.database.execute(CREATE_TABLE);
                 } catch (SQLException e) {
@@ -135,7 +135,7 @@ public class PlayersDatabasePlugin implements PlayersPlugin.Listener {
 
     @Override
     public void playerJoined (PlayerEntry target) {
-        DatabasePlugin.executorService.submit(() -> {
+        DatabasePlugin.EXECUTOR_SERVICE.submit(() -> {
             try {
                 final PreparedStatement insertPlayerStatement = Main.database.connection.prepareStatement(INSERT_PLAYER);
 
@@ -188,7 +188,7 @@ public class PlayersDatabasePlugin implements PlayersPlugin.Listener {
 
     @Override
     public void playerLeft (PlayerEntry target) {
-        DatabasePlugin.executorService.submit(() -> {
+        DatabasePlugin.EXECUTOR_SERVICE.submit(() -> {
             try {
                 final PreparedStatement updatePlayerStatement = Main.database.connection.prepareStatement(UPDATE_PLAYER);
 
diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersPlugin.java
index d5a9b371..6179ccc6 100644
--- a/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersPlugin.java
+++ b/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersPlugin.java
@@ -84,7 +84,7 @@ public class PlayersPlugin extends Bot.Listener implements TickPlugin.Listener {
     public CompletableFuture<String> getPlayerIP (PlayerEntry target, boolean forceSeen) {
         final CompletableFuture<String> outputFuture = new CompletableFuture<>();
 
-        DatabasePlugin.executorService.submit(() -> {
+        DatabasePlugin.EXECUTOR_SERVICE.submit(() -> {
             if (!forceSeen) {
                 final String databaseIP = bot.playersDatabase.getPlayerIP(target.profile.getName());
 
diff --git a/src/main/java/me/chayapak1/chomens_bot/util/DownloadUtilities.java b/src/main/java/me/chayapak1/chomens_bot/util/DownloadUtilities.java
index 3f086303..e580ff6e 100644
--- a/src/main/java/me/chayapak1/chomens_bot/util/DownloadUtilities.java
+++ b/src/main/java/me/chayapak1/chomens_bot/util/DownloadUtilities.java
@@ -34,7 +34,7 @@ public class DownloadUtilities {
     private static int limit = 0;
 
     static {
-        Main.executor.scheduleAtFixedRate(() -> limit = 0, 0, 1, TimeUnit.SECONDS);
+        Main.EXECUTOR.scheduleAtFixedRate(() -> limit = 0, 0, 1, TimeUnit.SECONDS);
     }
 
     public static byte[] DownloadToByteArray (URL url, int maxSize) throws IOException, KeyManagementException, NoSuchAlgorithmException {