diff --git a/src/main/java/me/dreamerzero/chatregulator/placeholders/formatter/IFormatter.java b/src/main/java/me/dreamerzero/chatregulator/placeholders/formatter/IFormatter.java
index 467b0b9d..5a24ecc0 100644
--- a/src/main/java/me/dreamerzero/chatregulator/placeholders/formatter/IFormatter.java
+++ b/src/main/java/me/dreamerzero/chatregulator/placeholders/formatter/IFormatter.java
@@ -1,15 +1,30 @@
 package me.dreamerzero.chatregulator.placeholders.formatter;
 
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
 import net.kyori.adventure.audience.Audience;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 
 public interface IFormatter {
-    Component parse(String string);
+    Component parse(
+        final @NotNull String string
+    );
 
-    Component parse(String string, TagResolver extraResolver);
+    Component parse(
+        final @NotNull String string,
+        final @NotNull TagResolver extraResolver
+    );
 
-    Component parse(String string, Audience audience);
+    Component parse(
+        final @NotNull String string,
+        final @Nullable Audience audience
+    );
 
-    Component parse(String string, Audience audience, TagResolver extraResolver);
+    Component parse(
+        final @NotNull String string,
+        final @Nullable Audience audience,
+        final @NotNull TagResolver extraResolver
+    );
 }
diff --git a/src/main/java/me/dreamerzero/chatregulator/placeholders/formatter/MiniPlaceholderFormatter.java b/src/main/java/me/dreamerzero/chatregulator/placeholders/formatter/MiniPlaceholderFormatter.java
index 607f50c9..b07e21d6 100644
--- a/src/main/java/me/dreamerzero/chatregulator/placeholders/formatter/MiniPlaceholderFormatter.java
+++ b/src/main/java/me/dreamerzero/chatregulator/placeholders/formatter/MiniPlaceholderFormatter.java
@@ -1,5 +1,8 @@
 package me.dreamerzero.chatregulator.placeholders.formatter;
 
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
 import me.dreamerzero.miniplaceholders.api.MiniPlaceholders;
 import net.kyori.adventure.audience.Audience;
 import net.kyori.adventure.text.Component;
@@ -9,38 +12,54 @@
 public final class MiniPlaceholderFormatter implements IFormatter {
 
     @Override
-    public Component parse(String string) {
-        TagResolver global = MiniPlaceholders.getGlobalPlaceholders();
-        return MiniMessage.miniMessage().deserialize(string, global);
+    public Component parse(
+        final @NotNull String string
+    ) {
+        return MiniMessage.miniMessage().deserialize(
+            string,
+            MiniPlaceholders.getGlobalPlaceholders()
+        );
     }
 
     @Override
-    public Component parse(String string, Audience audience) {
+    public Component parse(
+        final @NotNull String string,
+        final @Nullable Audience audience
+    ) {
         if(audience == null){
             return parse(string);
         }
-        TagResolver resolver = TagResolver.resolver(
-            MiniPlaceholders.getAudiencePlaceholders(audience),
-            MiniPlaceholders.getGlobalPlaceholders());
-        return MiniMessage.miniMessage().deserialize(string, resolver);
+        return MiniMessage.miniMessage().deserialize(
+            string,
+            MiniPlaceholders.getAudienceGlobalPlaceholders(audience)
+        );
     }
 
     @Override
-    public Component parse(String string, Audience audience, TagResolver extraResolver) {
+    public Component parse(
+        final @NotNull String string,
+        final @Nullable Audience audience,
+        final @NotNull TagResolver extraResolver
+    ) {
         if(audience == null){
             return parse(string, extraResolver);
         }
-        TagResolver resolver = TagResolver.resolver(
-            MiniPlaceholders.getGlobalPlaceholders(),
-            MiniPlaceholders.getAudiencePlaceholders(audience),
-            extraResolver);
-        return MiniMessage.miniMessage().deserialize(string, resolver);
+        return MiniMessage.miniMessage().deserialize(
+            string,
+            MiniPlaceholders.getAudienceGlobalPlaceholders(audience),
+            extraResolver
+        );
     }
 
     @Override
-    public Component parse(String string, TagResolver extraResolver) {
-        TagResolver global = TagResolver.resolver(MiniPlaceholders.getGlobalPlaceholders(), extraResolver);
-        return MiniMessage.miniMessage().deserialize(string, global);
+    public Component parse(
+        final @NotNull String string,
+        final @NotNull TagResolver extraResolver
+    ) {
+        return MiniMessage.miniMessage().deserialize(
+            string,
+            MiniPlaceholders.getGlobalPlaceholders(),
+            extraResolver
+        );
     }
-    
 }
diff --git a/src/main/java/me/dreamerzero/chatregulator/placeholders/formatter/NormalFormatter.java b/src/main/java/me/dreamerzero/chatregulator/placeholders/formatter/NormalFormatter.java
index 9e871ee8..9112ab5a 100644
--- a/src/main/java/me/dreamerzero/chatregulator/placeholders/formatter/NormalFormatter.java
+++ b/src/main/java/me/dreamerzero/chatregulator/placeholders/formatter/NormalFormatter.java
@@ -1,5 +1,8 @@
 package me.dreamerzero.chatregulator.placeholders.formatter;
 
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
 import net.kyori.adventure.audience.Audience;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.MiniMessage;
@@ -8,23 +11,34 @@
 public final class NormalFormatter implements IFormatter {
 
     @Override
-    public Component parse(String string) {
+    public Component parse(
+        final @NotNull String string
+    ) {
         return MiniMessage.miniMessage().deserialize(string);
     }
 
     @Override
-    public Component parse(String string, Audience audience) {
-        return MiniMessage.miniMessage().deserialize(string);
+    public Component parse(
+        final @NotNull String string,
+        final @Nullable Audience audience
+    ) {
+        return this.parse(string);
     }
 
     @Override
-    public Component parse(String string, Audience audience, TagResolver extraResolver) {
-        return MiniMessage.miniMessage().deserialize(string, extraResolver);
+    public Component parse(
+        final @NotNull String string,
+        final @Nullable Audience audience,
+        final @NotNull TagResolver extraResolver
+    ) {
+        return this.parse(string, extraResolver);
     }
 
     @Override
-    public Component parse(String string, TagResolver extraResolver) {
+    public Component parse(
+        final @NotNull String string,
+        final @NotNull TagResolver extraResolver
+    ) {
         return MiniMessage.miniMessage().deserialize(string, extraResolver);
     }
-
 }