diff --git a/src/main/java/eu/endermite/commandwhitelist/CommandWhitelist.java b/src/main/java/eu/endermite/commandwhitelist/CommandWhitelist.java
index ef71417..490accd 100644
--- a/src/main/java/eu/endermite/commandwhitelist/CommandWhitelist.java
+++ b/src/main/java/eu/endermite/commandwhitelist/CommandWhitelist.java
@@ -2,8 +2,8 @@ package eu.endermite.commandwhitelist;
 
 import eu.endermite.commandwhitelist.command.MainCommand;
 import eu.endermite.commandwhitelist.config.ConfigCache;
-import eu.endermite.commandwhitelist.listeners.PlayerCommandPreProcess;
-import eu.endermite.commandwhitelist.listeners.PlayerCommandSend;
+import eu.endermite.commandwhitelist.listeners.PlayerCommandPreProcessListener;
+import eu.endermite.commandwhitelist.listeners.PlayerCommandSendListener;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
@@ -21,8 +21,8 @@ public class CommandWhitelist extends JavaPlugin {
         commandWhitelist = this;
         reloadPluginConfig();
 
-        getServer().getPluginManager().registerEvents(new PlayerCommandPreProcess(), this);
-        getServer().getPluginManager().registerEvents(new PlayerCommandSend(), this);
+        getServer().getPluginManager().registerEvents(new PlayerCommandPreProcessListener(), this);
+        getServer().getPluginManager().registerEvents(new PlayerCommandSendListener(), this);
         getCommand("commandwhitelist").setExecutor(new MainCommand());
         getCommand("commandwhitelist").setTabCompleter(new MainCommand());
 
@@ -36,8 +36,6 @@ public class CommandWhitelist extends JavaPlugin {
 
     public void reloadPluginConfig(CommandSender sender) {
         getServer().getScheduler().runTaskAsynchronously(this, () -> {
-            // Don't ask why it's called twice, it somehow breaks if it's called only once.
-            reloadPluginConfig();
             reloadPluginConfig();
             for (Player p : Bukkit.getOnlinePlayers()) {
                 p.updateCommands();
diff --git a/src/main/java/eu/endermite/commandwhitelist/listeners/PlayerCommandPreProcess.java b/src/main/java/eu/endermite/commandwhitelist/listeners/PlayerCommandPreProcessListener.java
similarity index 95%
rename from src/main/java/eu/endermite/commandwhitelist/listeners/PlayerCommandPreProcess.java
rename to src/main/java/eu/endermite/commandwhitelist/listeners/PlayerCommandPreProcessListener.java
index 50d6e1b..3800570 100644
--- a/src/main/java/eu/endermite/commandwhitelist/listeners/PlayerCommandPreProcess.java
+++ b/src/main/java/eu/endermite/commandwhitelist/listeners/PlayerCommandPreProcessListener.java
@@ -9,7 +9,7 @@ import org.bukkit.event.Listener;
 import java.util.List;
 import java.util.Map;
 
-public class PlayerCommandPreProcess implements Listener {
+public class PlayerCommandPreProcessListener implements Listener {
 
     @EventHandler(priority = EventPriority.HIGHEST)
     public void PlayerCommandSendEvent(org.bukkit.event.player.PlayerCommandPreprocessEvent event) {
diff --git a/src/main/java/eu/endermite/commandwhitelist/listeners/PlayerCommandSend.java b/src/main/java/eu/endermite/commandwhitelist/listeners/PlayerCommandSendListener.java
similarity index 94%
rename from src/main/java/eu/endermite/commandwhitelist/listeners/PlayerCommandSend.java
rename to src/main/java/eu/endermite/commandwhitelist/listeners/PlayerCommandSendListener.java
index c280e9a..fcd5e28 100644
--- a/src/main/java/eu/endermite/commandwhitelist/listeners/PlayerCommandSend.java
+++ b/src/main/java/eu/endermite/commandwhitelist/listeners/PlayerCommandSendListener.java
@@ -7,7 +7,7 @@ import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import java.util.*;
 
-public class PlayerCommandSend implements Listener {
+public class PlayerCommandSendListener implements Listener {
 
     @EventHandler(priority = EventPriority.HIGHEST)
     public void PlayerCommandSendEvent(org.bukkit.event.player.PlayerCommandSendEvent event) {
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index 0a6523b..ae8edcc 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -12,7 +12,6 @@ commands:
   # commandwhitelist.commands.default
   # this will be automatically given to players by default
   default:
-    - ?
     - help
     - spawn
     - bal