diff --git a/VillagerOptimizer-1.16.5/src/main/java/me/xginko/villageroptimizer/VillagerCache.java b/VillagerOptimizer-1.16.5/src/main/java/me/xginko/villageroptimizer/VillagerCache.java
index 5eb4423..48ae662 100644
--- a/VillagerOptimizer-1.16.5/src/main/java/me/xginko/villageroptimizer/VillagerCache.java
+++ b/VillagerOptimizer-1.16.5/src/main/java/me/xginko/villageroptimizer/VillagerCache.java
@@ -24,17 +24,17 @@ public final class VillagerCache {
     }
 
     public @Nullable WrappedVillager get(@NotNull UUID uuid) {
-        WrappedVillager wrappedVillager = villagerCache.getIfPresent(uuid);
+        WrappedVillager wrappedVillager = this.villagerCache.getIfPresent(uuid);
         return wrappedVillager == null && Bukkit.getEntity(uuid) instanceof Villager villager ? add(villager) : wrappedVillager;
     }
 
     public @NotNull WrappedVillager getOrAdd(@NotNull Villager villager) {
-        WrappedVillager wrappedVillager = villagerCache.getIfPresent(villager.getUniqueId());
+        WrappedVillager wrappedVillager = this.villagerCache.getIfPresent(villager.getUniqueId());
         return wrappedVillager == null ? add(new WrappedVillager(villager)) : add(wrappedVillager);
     }
 
     public @NotNull WrappedVillager add(@NotNull WrappedVillager villager) {
-        villagerCache.put(villager.villager().getUniqueId(), villager);
+        this.villagerCache.put(villager.villager().getUniqueId(), villager);
         return villager;
     }
 
@@ -43,14 +43,14 @@ public final class VillagerCache {
     }
 
     public boolean contains(@NotNull UUID uuid) {
-        return villagerCache.getIfPresent(uuid) != null;
+        return this.villagerCache.getIfPresent(uuid) != null;
     }
 
     public boolean contains(@NotNull WrappedVillager villager) {
-        return villagerCache.getIfPresent(villager.villager().getUniqueId()) != null;
+        return this.villagerCache.getIfPresent(villager.villager().getUniqueId()) != null;
     }
 
     public boolean contains(@NotNull Villager villager) {
-        return villagerCache.getIfPresent(villager.getUniqueId()) != null;
+        return this.villagerCache.getIfPresent(villager.getUniqueId()) != null;
     }
 }
\ No newline at end of file
diff --git a/VillagerOptimizer-1.16.5/src/main/java/me/xginko/villageroptimizer/commands/optimizevillagers/OptVillagersRadius.java b/VillagerOptimizer-1.16.5/src/main/java/me/xginko/villageroptimizer/commands/optimizevillagers/OptVillagersRadius.java
index 7439aa0..5f7bf0d 100644
--- a/VillagerOptimizer-1.16.5/src/main/java/me/xginko/villageroptimizer/commands/optimizevillagers/OptVillagersRadius.java
+++ b/VillagerOptimizer-1.16.5/src/main/java/me/xginko/villageroptimizer/commands/optimizevillagers/OptVillagersRadius.java
@@ -89,8 +89,7 @@ public class OptVillagersRadius implements VillagerOptimizerCommand, TabComplete
 
                     if (player_has_cooldown_bypass || wVillager.canOptimize(cooldown)) {
                         VillagerOptimizeEvent optimizeEvent = new VillagerOptimizeEvent(wVillager, OptimizationType.COMMAND, player);
-                        optimizeEvent.callEvent();
-                        if (!optimizeEvent.isCancelled()) {
+                        if (optimizeEvent.callEvent()) {
                             wVillager.setOptimization(optimizeEvent.getOptimizationType());
                             wVillager.saveOptimizeTime();
                             successCount++;
diff --git a/VillagerOptimizer-1.16.5/src/main/java/me/xginko/villageroptimizer/commands/unoptimizevillagers/UnOptVillagersRadius.java b/VillagerOptimizer-1.16.5/src/main/java/me/xginko/villageroptimizer/commands/unoptimizevillagers/UnOptVillagersRadius.java
index b7da7b0..656cd36 100644
--- a/VillagerOptimizer-1.16.5/src/main/java/me/xginko/villageroptimizer/commands/unoptimizevillagers/UnOptVillagersRadius.java
+++ b/VillagerOptimizer-1.16.5/src/main/java/me/xginko/villageroptimizer/commands/unoptimizevillagers/UnOptVillagersRadius.java
@@ -81,8 +81,7 @@ public class UnOptVillagersRadius implements VillagerOptimizerCommand, TabComple
 
                     if (wVillager.isOptimized()) {
                         VillagerUnoptimizeEvent unOptimizeEvent = new VillagerUnoptimizeEvent(wVillager, player, OptimizationType.COMMAND);
-                        unOptimizeEvent.callEvent();
-                        if (!unOptimizeEvent.isCancelled()) {
+                        if (unOptimizeEvent.callEvent()) {
                             wVillager.setOptimization(OptimizationType.NONE);
                             successCount++;
                         }
diff --git a/VillagerOptimizer-1.16.5/src/main/java/me/xginko/villageroptimizer/modules/optimization/OptimizeByBlock.java b/VillagerOptimizer-1.16.5/src/main/java/me/xginko/villageroptimizer/modules/optimization/OptimizeByBlock.java
index 5e1a15b..1c15da6 100644
--- a/VillagerOptimizer-1.16.5/src/main/java/me/xginko/villageroptimizer/modules/optimization/OptimizeByBlock.java
+++ b/VillagerOptimizer-1.16.5/src/main/java/me/xginko/villageroptimizer/modules/optimization/OptimizeByBlock.java
@@ -109,8 +109,7 @@ public class OptimizeByBlock implements VillagerOptimizerModule, Listener {
 
         if (closestOptimizableVillager.canOptimize(cooldown) || player.hasPermission(Permissions.Bypass.BLOCK_COOLDOWN.get())) {
             VillagerOptimizeEvent optimizeEvent = new VillagerOptimizeEvent(closestOptimizableVillager, OptimizationType.BLOCK, player, event.isAsynchronous());
-            optimizeEvent.callEvent();
-            if (optimizeEvent.isCancelled()) return;
+            if (!optimizeEvent.callEvent()) return;
 
             closestOptimizableVillager.setOptimization(optimizeEvent.getOptimizationType());
             closestOptimizableVillager.saveOptimizeTime();
@@ -170,8 +169,7 @@ public class OptimizeByBlock implements VillagerOptimizerModule, Listener {
         if (closestOptimizedVillager == null) return;
 
         VillagerUnoptimizeEvent unOptimizeEvent = new VillagerUnoptimizeEvent(closestOptimizedVillager, player, OptimizationType.BLOCK, event.isAsynchronous());
-        unOptimizeEvent.callEvent();
-        if (unOptimizeEvent.isCancelled()) return;
+        if (!unOptimizeEvent.callEvent()) return;
 
         closestOptimizedVillager.setOptimization(OptimizationType.NONE);
 
diff --git a/VillagerOptimizer-1.16.5/src/main/java/me/xginko/villageroptimizer/modules/optimization/OptimizeByNametag.java b/VillagerOptimizer-1.16.5/src/main/java/me/xginko/villageroptimizer/modules/optimization/OptimizeByNametag.java
index 5846a16..139bd81 100644
--- a/VillagerOptimizer-1.16.5/src/main/java/me/xginko/villageroptimizer/modules/optimization/OptimizeByNametag.java
+++ b/VillagerOptimizer-1.16.5/src/main/java/me/xginko/villageroptimizer/modules/optimization/OptimizeByNametag.java
@@ -85,8 +85,7 @@ public class OptimizeByNametag implements VillagerOptimizerModule, Listener {
         if (nametags.contains(name.toLowerCase())) {
             if (wVillager.canOptimize(cooldown) || player.hasPermission(Permissions.Bypass.NAMETAG_COOLDOWN.get())) {
                 VillagerOptimizeEvent optimizeEvent = new VillagerOptimizeEvent(wVillager, OptimizationType.NAMETAG, player, event.isAsynchronous());
-                optimizeEvent.callEvent();
-                if (optimizeEvent.isCancelled()) return;
+                if (!optimizeEvent.callEvent()) return;
 
                 if (!consume_nametag) {
                     event.setCancelled(true);
@@ -113,8 +112,7 @@ public class OptimizeByNametag implements VillagerOptimizerModule, Listener {
         } else {
             if (wVillager.isOptimized()) {
                 VillagerUnoptimizeEvent unOptimizeEvent = new VillagerUnoptimizeEvent(wVillager, player, OptimizationType.NAMETAG, event.isAsynchronous());
-                unOptimizeEvent.callEvent();
-                if (unOptimizeEvent.isCancelled()) return;
+                if (!unOptimizeEvent.callEvent()) return;
 
                 wVillager.setOptimization(OptimizationType.NONE);
 
diff --git a/VillagerOptimizer-1.16.5/src/main/java/me/xginko/villageroptimizer/modules/optimization/OptimizeByWorkstation.java b/VillagerOptimizer-1.16.5/src/main/java/me/xginko/villageroptimizer/modules/optimization/OptimizeByWorkstation.java
index 9f86154..b720acc 100644
--- a/VillagerOptimizer-1.16.5/src/main/java/me/xginko/villageroptimizer/modules/optimization/OptimizeByWorkstation.java
+++ b/VillagerOptimizer-1.16.5/src/main/java/me/xginko/villageroptimizer/modules/optimization/OptimizeByWorkstation.java
@@ -93,8 +93,7 @@ public class OptimizeByWorkstation implements VillagerOptimizerModule, Listener
 
         if (closestOptimizableVillager.canOptimize(cooldown) || player.hasPermission(Permissions.Bypass.WORKSTATION_COOLDOWN.get())) {
             VillagerOptimizeEvent optimizeEvent = new VillagerOptimizeEvent(closestOptimizableVillager, OptimizationType.WORKSTATION, player, event.isAsynchronous());
-            optimizeEvent.callEvent();
-            if (optimizeEvent.isCancelled()) return;
+            if (!optimizeEvent.callEvent()) return;
 
             closestOptimizableVillager.setOptimization(optimizeEvent.getOptimizationType());
             closestOptimizableVillager.saveOptimizeTime();
@@ -158,8 +157,7 @@ public class OptimizeByWorkstation implements VillagerOptimizerModule, Listener
         if (closestOptimizedVillager == null) return;
 
         VillagerUnoptimizeEvent unOptimizeEvent = new VillagerUnoptimizeEvent(closestOptimizedVillager, player, OptimizationType.WORKSTATION, event.isAsynchronous());
-        unOptimizeEvent.callEvent();
-        if (unOptimizeEvent.isCancelled()) return;
+        if (!unOptimizeEvent.callEvent()) return;
 
         closestOptimizedVillager.setOptimization(OptimizationType.NONE);