diff --git a/src/main/java/me/chayapak1/chomens_bot/Main.java b/src/main/java/me/chayapak1/chomens_bot/Main.java
index 4caca0fa..e1c0b58e 100644
--- a/src/main/java/me/chayapak1/chomens_bot/Main.java
+++ b/src/main/java/me/chayapak1/chomens_bot/Main.java
@@ -83,8 +83,7 @@ public class Main {
 
         config = yaml.load(reader);
 
-        final Thread shutdownThread = new Thread(Main::handleShutdown);
-        shutdownThread.setName("ChomeNS Bot Shutdown Thread");
+        final Thread shutdownThread = new Thread(Main::handleShutdown, "ChomeNS Bot Shutdown Thread");
         Runtime.getRuntime().addShutdownHook(shutdownThread);
 
         if (!config.backup.enabled) {
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 633fb02f..44b31b00 100644
--- a/src/main/java/me/chayapak1/chomens_bot/plugins/DatabasePlugin.java
+++ b/src/main/java/me/chayapak1/chomens_bot/plugins/DatabasePlugin.java
@@ -12,9 +12,10 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.ThreadPoolExecutor;
 
 public class DatabasePlugin {
-    public static final ExecutorService executorService = Executors.newFixedThreadPool(
-            1,
-            new ThreadFactoryBuilder().setNameFormat("ExecutorService (database)").build()
+    public static final ExecutorService executorService = Executors.newSingleThreadExecutor(
+            new ThreadFactoryBuilder()
+                    .setNameFormat("ExecutorService (database)")
+                    .build()
     );
 
     public Connection connection;
diff --git a/src/main/java/me/chayapak1/chomens_bot/util/FileLoggerUtilities.java b/src/main/java/me/chayapak1/chomens_bot/util/FileLoggerUtilities.java
index 1afcef0f..199af99c 100644
--- a/src/main/java/me/chayapak1/chomens_bot/util/FileLoggerUtilities.java
+++ b/src/main/java/me/chayapak1/chomens_bot/util/FileLoggerUtilities.java
@@ -35,7 +35,9 @@ public class FileLoggerUtilities {
 
     // we want a completely separate executor from the main one
     public static final ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor(
-            new ThreadFactoryBuilder().setNameFormat("ScheduledExecutorService (logger)").build()
+            new ThreadFactoryBuilder()
+                    .setNameFormat("ScheduledExecutorService (logger)")
+                    .build()
     );
 
     public static int spamLevel = 0;