diff --git a/src/main/java/me/xginko/villageroptimizer/config/Config.java b/src/main/java/me/xginko/villageroptimizer/config/Config.java
index 6c5f17a..d8e25e9 100644
--- a/src/main/java/me/xginko/villageroptimizer/config/Config.java
+++ b/src/main/java/me/xginko/villageroptimizer/config/Config.java
@@ -3,6 +3,7 @@ package me.xginko.villageroptimizer.config;
 import io.github.thatsmusic99.configurationmaster.api.ConfigFile;
 import io.github.thatsmusic99.configurationmaster.api.ConfigSection;
 import me.xginko.villageroptimizer.VillagerOptimizer;
+import org.jetbrains.annotations.NotNull;
 
 import java.io.File;
 import java.util.List;
@@ -11,8 +12,8 @@ import java.util.Map;
 
 public class Config {
 
-    private final ConfigFile config;
-    public final Locale default_lang;
+    private final @NotNull ConfigFile config;
+    public final @NotNull Locale default_lang;
     public final boolean auto_lang;
     public final long cache_keep_time_seconds;
 
@@ -61,80 +62,80 @@ public class Config {
         config.addDefault("gameplay.prevent-damage.enable", true);
     }
 
-    public void createTitledSection(String title, String path) {
+    public void createTitledSection(@NotNull String title, @NotNull String path) {
         config.addSection(title);
         config.addDefault(path, null);
     }
 
-    public ConfigFile master() {
+    public @NotNull ConfigFile master() {
         return config;
     }
 
-    public boolean getBoolean(String path, boolean def, String comment) {
+    public boolean getBoolean(@NotNull String path, boolean def, @NotNull String comment) {
         config.addDefault(path, def, comment);
         return config.getBoolean(path, def);
     }
 
-    public boolean getBoolean(String path, boolean def) {
+    public boolean getBoolean(@NotNull String path, boolean def) {
         config.addDefault(path, def);
         return config.getBoolean(path, def);
     }
 
-    public String getString(String path, String def, String comment) {
+    public @NotNull String getString(@NotNull String path, @NotNull String def, @NotNull String comment) {
         config.addDefault(path, def, comment);
         return config.getString(path, def);
     }
 
-    public String getString(String path, String def) {
+    public @NotNull String getString(@NotNull String path, @NotNull String def) {
         config.addDefault(path, def);
         return config.getString(path, def);
     }
 
-    public double getDouble(String path, Double def, String comment) {
+    public double getDouble(@NotNull String path, @NotNull Double def, @NotNull String comment) {
         config.addDefault(path, def, comment);
         return config.getDouble(path, def);
     }
 
-    public double getDouble(String path, Double def) {
+    public double getDouble(@NotNull String path, @NotNull Double def) {
         config.addDefault(path, def);
         return config.getDouble(path, def);
     }
 
-    public int getInt(String path, int def, String comment) {
+    public int getInt(@NotNull String path, int def, @NotNull String comment) {
         config.addDefault(path, def, comment);
         return config.getInteger(path, def);
     }
 
-    public int getInt(String path, int def) {
+    public int getInt(@NotNull String path, int def) {
         config.addDefault(path, def);
         return config.getInteger(path, def);
     }
 
-    public List<String> getList(String path, List<String> def, String comment) {
+    public @NotNull List<String> getList(@NotNull String path, @NotNull List<String> def, @NotNull String comment) {
         config.addDefault(path, def, comment);
         return config.getStringList(path);
     }
 
-    public List<String> getList(String path, List<String> def) {
+    public @NotNull List<String> getList(@NotNull String path, @NotNull List<String> def) {
         config.addDefault(path, def);
         return config.getStringList(path);
     }
 
-    public ConfigSection getConfigSection(String path, Map<String, Object> defaultKeyValue) {
+    public @NotNull ConfigSection getConfigSection(@NotNull String path, @NotNull Map<String, Object> defaultKeyValue) {
         config.addDefault(path, null);
         config.makeSectionLenient(path);
         defaultKeyValue.forEach((string, object) -> config.addExample(path+"."+string, object));
         return config.getConfigSection(path);
     }
 
-    public ConfigSection getConfigSection(String path, Map<String, Object> defaultKeyValue, String comment) {
+    public @NotNull ConfigSection getConfigSection(@NotNull String path, @NotNull Map<String, Object> defaultKeyValue, @NotNull String comment) {
         config.addDefault(path, null, comment);
         config.makeSectionLenient(path);
         defaultKeyValue.forEach((string, object) -> config.addExample(path+"."+string, object));
         return config.getConfigSection(path);
     }
 
-    public void addComment(String path, String comment) {
+    public void addComment(@NotNull String path, @NotNull String comment) {
         config.addComment(path, comment);
     }
 }
diff --git a/src/main/java/me/xginko/villageroptimizer/config/LanguageCache.java b/src/main/java/me/xginko/villageroptimizer/config/LanguageCache.java
index fcf1045..ef5fa72 100644
--- a/src/main/java/me/xginko/villageroptimizer/config/LanguageCache.java
+++ b/src/main/java/me/xginko/villageroptimizer/config/LanguageCache.java
@@ -4,17 +4,18 @@ import io.github.thatsmusic99.configurationmaster.api.ConfigFile;
 import me.xginko.villageroptimizer.VillagerOptimizer;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.MiniMessage;
+import org.jetbrains.annotations.NotNull;
 
 import java.io.File;
 import java.util.List;
 
 public class LanguageCache {
 
-    private final ConfigFile lang;
-    private final MiniMessage miniMessage;
+    private final @NotNull ConfigFile lang;
+    private final @NotNull MiniMessage miniMessage;
 
-    public final Component no_permission;
-    public final List<Component> nametag_optimize_success, nametag_on_optimize_cooldown, nametag_unoptimize_success,
+    public final @NotNull Component no_permission;
+    public final @NotNull List<Component> nametag_optimize_success, nametag_on_optimize_cooldown, nametag_unoptimize_success,
             block_optimize_success, block_on_optimize_cooldown, block_unoptimize_success,
             workstation_optimize_success, workstation_on_optimize_cooldown, workstation_unoptimize_success,
             command_optimize_success, command_radius_limit_exceed, command_optimize_fail, command_unoptimize_success,
@@ -89,22 +90,22 @@ public class LanguageCache {
         }
     }
 
-    public Component getTranslation(String path, String defaultTranslation) {
+    public @NotNull Component getTranslation(@NotNull String path, @NotNull String defaultTranslation) {
         lang.addDefault(path, defaultTranslation);
         return miniMessage.deserialize(lang.getString(path, defaultTranslation));
     }
 
-    public Component getTranslation(String path, String defaultTranslation, String comment) {
+    public @NotNull Component getTranslation(@NotNull String path, @NotNull String defaultTranslation, @NotNull String comment) {
         lang.addDefault(path, defaultTranslation, comment);
         return miniMessage.deserialize(lang.getString(path, defaultTranslation));
     }
 
-    public List<Component> getListTranslation(String path, List<String> defaultTranslation) {
+    public @NotNull List<Component> getListTranslation(@NotNull String path, @NotNull List<String> defaultTranslation) {
         lang.addDefault(path, defaultTranslation);
         return lang.getStringList(path).stream().map(miniMessage::deserialize).toList();
     }
 
-    public List<Component> getListTranslation(String path, List<String> defaultTranslation, String comment) {
+    public @NotNull List<Component> getListTranslation(@NotNull String path, @NotNull List<String> defaultTranslation, @NotNull String comment) {
         lang.addDefault(path, defaultTranslation, comment);
         return lang.getStringList(path).stream().map(miniMessage::deserialize).toList();
     }
diff --git a/src/main/java/me/xginko/villageroptimizer/modules/optimizations/OptimizeByNametag.java b/src/main/java/me/xginko/villageroptimizer/modules/optimizations/OptimizeByNametag.java
index bb0a6f7..76579a7 100644
--- a/src/main/java/me/xginko/villageroptimizer/modules/optimizations/OptimizeByNametag.java
+++ b/src/main/java/me/xginko/villageroptimizer/modules/optimizations/OptimizeByNametag.java
@@ -84,7 +84,7 @@ public class OptimizeByNametag implements VillagerOptimizerModule, Listener {
             if (wVillager.canOptimize(cooldown) || player.hasPermission(Permissions.Bypass.NAMETAG_COOLDOWN.get())) {
                 wVillager.setOptimization(OptimizationType.NAMETAG);
                 wVillager.saveOptimizeTime();
-                if (!consumeNametag) {
+                if (!consumeNametag) { // This needs a better alternative
                     ItemStack mainHand = player.getInventory().getItemInMainHand();
                     ItemStack offHand = player.getInventory().getItemInOffHand();
                     if (mainHand.getType().equals(Material.NAME_TAG)) mainHand.add();