diff --git a/paper/src/main/java/me/h1dd3nxn1nja/chatmanager/Methods.java b/paper/src/main/java/me/h1dd3nxn1nja/chatmanager/Methods.java
index b9cc49e..142fd8c 100644
--- a/paper/src/main/java/me/h1dd3nxn1nja/chatmanager/Methods.java
+++ b/paper/src/main/java/me/h1dd3nxn1nja/chatmanager/Methods.java
@@ -48,9 +48,15 @@ public static String getPrefix() {
 	public static String noPermission() {
 		return color(settingsManager.getMessages().getString("Message.No_Permission").replace("{Prefix}", getPrefix()));
 	}
-	
-	public static boolean getMuted() {
-	    return CommandMuteChat.muted;
+
+	private static boolean isMuted;
+
+	public static boolean isMuted() {
+	    return isMuted;
+	}
+
+	public static void setMuted() {
+		isMuted = !isMuted;
 	}
 	
 	public static void tellConsole(String message, boolean prefix) {
diff --git a/paper/src/main/java/me/h1dd3nxn1nja/chatmanager/commands/CommandMuteChat.java b/paper/src/main/java/me/h1dd3nxn1nja/chatmanager/commands/CommandMuteChat.java
index 80a6f78..b38babe 100644
--- a/paper/src/main/java/me/h1dd3nxn1nja/chatmanager/commands/CommandMuteChat.java
+++ b/paper/src/main/java/me/h1dd3nxn1nja/chatmanager/commands/CommandMuteChat.java
@@ -19,8 +19,6 @@ public class CommandMuteChat implements CommandExecutor {
 
 	private final PlaceholderManager placeholderManager = plugin.getCrazyManager().getPlaceholderManager();
 
-	public static boolean muted;
-
 	public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @NotNull String label, String[] args) {
 		FileConfiguration messages = settingsManager.getMessages();
 		
@@ -32,11 +30,11 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @N
 		if (cmd.getName().equalsIgnoreCase("MuteChat")) {
 			if (player.hasPermission("chatmanager.mutechat")) {
 				if (args.length == 0) {
-					if (muted) {
-						muted = false;
+					if (Methods.isMuted()) {
+						Methods.setMuted();
 						Methods.broadcast(placeholderManager.setPlaceholders(player, messages.getString("Mute_Chat.Broadcast_Messages.Enabled").replace("{player}", player.getName())));
 					} else {
-						muted = true;
+						Methods.setMuted();
 						Methods.broadcast(placeholderManager.setPlaceholders(player, messages.getString("Mute_Chat.Broadcast_Messages.Disabled").replace("{player}", player.getName())));
 					}
 
@@ -50,8 +48,8 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @N
 			if (args[0].equalsIgnoreCase("-s")) {
 				if (player.hasPermission("chatmanager.mutechat.silent")) {
 					if (args.length == 1) {
-						if (muted) {
-							muted = false;
+						if (Methods.isMuted()) {
+							Methods.setMuted();
 							for (Player staff : plugin.getServer().getOnlinePlayers()) {
 								if (staff.hasPermission("chatmanager.bypass.mutechat")) {
 									Methods.sendMessage(player, placeholderManager.setPlaceholders(player, messages.getString("Mute_Chat.Broadcast_Messages.Enabled").replace("{player}", player.getName())), true);
@@ -60,7 +58,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @N
 							}
 
 						} else {
-							muted = true;
+							Methods.setMuted();
 							for (Player staff : plugin.getServer().getOnlinePlayers()) {
 								if (staff.hasPermission("chatmanager.bypass.mutechat")) {
 									Methods.sendMessage(player, placeholderManager.setPlaceholders(player, messages.getString("Mute_Chat.Broadcast_Messages.Disabled").replace("{player}", player.getName())), true);
diff --git a/paper/src/main/java/me/h1dd3nxn1nja/chatmanager/listeners/ListenerAntiAdvertising.java b/paper/src/main/java/me/h1dd3nxn1nja/chatmanager/listeners/ListenerAntiAdvertising.java
index 45b8355..5e10daf 100644
--- a/paper/src/main/java/me/h1dd3nxn1nja/chatmanager/listeners/ListenerAntiAdvertising.java
+++ b/paper/src/main/java/me/h1dd3nxn1nja/chatmanager/listeners/ListenerAntiAdvertising.java
@@ -32,7 +32,7 @@ public void onChat(AsyncPlayerChatEvent event) {
 		FileConfiguration messages = settingsManager.getMessages();
 
 		Player player = event.getPlayer();
-		String playername = event.getPlayer().getName();
+		String playerName = event.getPlayer().getName();
 		String message = event.getMessage();
 		Date time = Calendar.getInstance().getTime();
 
@@ -58,11 +58,11 @@ public void onChat(AsyncPlayerChatEvent event) {
 		}
 
 		if (config.getBoolean("Anti_Advertising.Chat.Increase_Sensitivity")) {
-			chatMatch(event, config, messages, player, playername, message, time, firstMatchIncrease, secondMatchIncrease);
+			chatMatch(event, config, messages, player, playerName, message, time, firstMatchIncrease, secondMatchIncrease);
 			return;
 		}
 
-		chatMatch(event, config, messages, player, playername, message, time, firstMatch, secondMatch);
+		chatMatch(event, config, messages, player, playerName, message, time, firstMatch, secondMatch);
 	}
 
 	private void chatMatch(AsyncPlayerChatEvent event, FileConfiguration config, FileConfiguration messages, Player player, String playername, String message, Date time, Matcher firstMatch, Matcher secondMatch) {
@@ -250,6 +250,7 @@ public void onSign(SignChangeEvent event) {
 
 	private boolean findMatches(SignChangeEvent event, FileConfiguration config, FileConfiguration messages, Player player, String message, String str, Matcher firstMatch, Matcher secondMatch) {
 		if (!firstMatch.find() || !secondMatch.find()) return false;
+
 		event.setCancelled(true);
 		Methods.sendMessage(player, messages.getString("Anti_Advertising.Signs.Message"), true);
 
diff --git a/paper/src/main/java/me/h1dd3nxn1nja/chatmanager/listeners/ListenerAntiUnicode.java b/paper/src/main/java/me/h1dd3nxn1nja/chatmanager/listeners/ListenerAntiUnicode.java
index cffdf67..103183e 100644
--- a/paper/src/main/java/me/h1dd3nxn1nja/chatmanager/listeners/ListenerAntiUnicode.java
+++ b/paper/src/main/java/me/h1dd3nxn1nja/chatmanager/listeners/ListenerAntiUnicode.java
@@ -33,8 +33,7 @@ public void onChat(AsyncPlayerChatEvent event) {
 		Pattern pattern = Pattern.compile("^[A-Za-z0-9-~!@#$%^&*()<>_+=-{}|';:.,\\[\"\"]|';:.,/?><_.]+$");
 		Matcher matcher = pattern.matcher(event.getMessage().toLowerCase().replaceAll("\\s+", ""));
 
-		if (!config.getBoolean("Anti_Unicode.Enable") || plugin.api().getStaffChatData().containsUser(player.getUniqueId()))
-			return;
+		if (!config.getBoolean("Anti_Unicode.Enable") || plugin.api().getStaffChatData().containsUser(player.getUniqueId())) return;
 
 		if (player.hasPermission("chatmanager.bypass.antiunicode")) return;
 
diff --git a/paper/src/main/java/me/h1dd3nxn1nja/chatmanager/listeners/ListenerBannedCommand.java b/paper/src/main/java/me/h1dd3nxn1nja/chatmanager/listeners/ListenerBannedCommand.java
index ee9732a..61c19f6 100644
--- a/paper/src/main/java/me/h1dd3nxn1nja/chatmanager/listeners/ListenerBannedCommand.java
+++ b/paper/src/main/java/me/h1dd3nxn1nja/chatmanager/listeners/ListenerBannedCommand.java
@@ -20,46 +20,46 @@ public class ListenerBannedCommand implements Listener {
 	@EventHandler
 	public void onCommand(PlayerCommandPreprocessEvent event) {
 		FileConfiguration config = settingsManager.getConfig();
-		FileConfiguration bannedcommands = settingsManager.getBannedCommands();
+		FileConfiguration bannedCommands = settingsManager.getBannedCommands();
 		FileConfiguration messages = settingsManager.getMessages();
 
 		Player player = event.getPlayer();
 
-		List<String> cmd = bannedcommands.getStringList("Banned-Commands");
-
-		if (config.getBoolean("Banned_Commands.Enable")) {
-			if (!player.hasPermission("chatmanager.bypass.bannedcommands")) {
-				if (!config.getBoolean("Banned_Commands.Increase_Sensitivity")) {
-					for (String command : cmd) {
-						if (event.getMessage().toLowerCase().equals("/" + command)) {
-							event.setCancelled(true);
-							Methods.sendMessage(player, messages.getString("Banned_Commands.Message").replace("{command}", command), true);
-							NotifyStaff(player, command);
-							TellConsole(player, command);
-							ExecuteCommand(player);
-						}
+		List<String> cmd = bannedCommands.getStringList("Banned-Commands");
+
+		if (config.getBoolean("Banned_Commands.Enable")) return;
+
+		if (!player.hasPermission("chatmanager.bypass.bannedcommands")) {
+			if (!config.getBoolean("Banned_Commands.Increase_Sensitivity")) {
+				for (String command : cmd) {
+					if (event.getMessage().toLowerCase().equals("/" + command)) {
+						event.setCancelled(true);
+						Methods.sendMessage(player, messages.getString("Banned_Commands.Message").replace("{command}", command), true);
+						NotifyStaff(player, command);
+						TellConsole(player, command);
+						ExecuteCommand(player);
 					}
-				} else {
-					for (String command : cmd) {
-						if (event.getMessage().toLowerCase().contains("/" + command)) {
-							event.setCancelled(true);
-							Methods.sendMessage(player, messages.getString("Banned_Commands.Message").replace("{command}", command), true);
-							NotifyStaff(player, command);
-							TellConsole(player, command);
-							ExecuteCommand(player);
-						}
+				}
+			} else {
+				for (String command : cmd) {
+					if (event.getMessage().toLowerCase().contains("/" + command)) {
+						event.setCancelled(true);
+						Methods.sendMessage(player, messages.getString("Banned_Commands.Message").replace("{command}", command), true);
+						NotifyStaff(player, command);
+						TellConsole(player, command);
+						ExecuteCommand(player);
 					}
 				}
 			}
+		}
 
-			if (!player.hasPermission("chatmanager.bypass.coloncommands")) {
-				if (event.getMessage().split(" ")[0].contains(":")) {
-					event.setCancelled(true);
-					Methods.sendMessage(player, messages.getString("Banned_Commands.Message").replace("{command}", event.getMessage().replace("/", "")), true);
-					NotifyStaff(player, event.getMessage().replace("/", ""));
-					TellConsole(player, event.getMessage().replace("/", ""));
-					ExecuteCommand(player);
-				}
+		if (!player.hasPermission("chatmanager.bypass.coloncommands")) {
+			if (event.getMessage().split(" ")[0].contains(":")) {
+				event.setCancelled(true);
+				Methods.sendMessage(player, messages.getString("Banned_Commands.Message").replace("{command}", event.getMessage().replace("/", "")), true);
+				NotifyStaff(player, event.getMessage().replace("/", ""));
+				TellConsole(player, event.getMessage().replace("/", ""));
+				ExecuteCommand(player);
 			}
 		}
 	}
@@ -68,42 +68,42 @@ public void NotifyStaff(Player player, String message) {
 		FileConfiguration config = settingsManager.getConfig();
 		FileConfiguration messages = settingsManager.getMessages();
 
-		if (config.getBoolean("Banned_Commands.Notify_Staff")) {
-			for (Player staff : plugin.getServer().getOnlinePlayers()) {
-				if (staff.hasPermission("chatmanager.notify.bannedcommands")) {
-					Methods.sendMessage(staff, messages.getString("Banned_Commands.Message").replace("{player}", player.getName()).replace("{command}", message), true);
-				}
+		if (!config.getBoolean("Banned_Commands.Notify_Staff")) return;
+
+		for (Player staff : plugin.getServer().getOnlinePlayers()) {
+			if (staff.hasPermission("chatmanager.notify.bannedcommands")) {
+				Methods.sendMessage(staff, messages.getString("Banned_Commands.Message").replace("{player}", player.getName()).replace("{command}", message), true);
 			}
 		}
 	}
-	
+
 	public void TellConsole(Player player, String message) {
 		FileConfiguration config = settingsManager.getConfig();
 		FileConfiguration messages = settingsManager.getMessages();
-		
-		if (config.getBoolean("Banned_Commands.Notify_Staff")) {
-			Methods.tellConsole(messages.getString("Banned_Commands.Notify_Staff_Format").replace("{player}", player.getName()).replace("{command}", message), true);
-		}
+
+		if (!config.getBoolean("Banned_Commands.Notify_Staff")) return;
+
+		Methods.tellConsole(messages.getString("Banned_Commands.Notify_Staff_Format").replace("{player}", player.getName()).replace("{command}", message), true);
 	}
 
 	public void ExecuteCommand(Player player) {
 		FileConfiguration config = settingsManager.getConfig();
-		
-		if (config.getBoolean("Banned_Commands.Execute_Command")) {
-			if (config.contains("Banned_Commands.Executed_Command")) {
-				String command = config.getString("Banned_Commands.Executed_Command").replace("{player}", player.getName());
-				List<String> commands = config.getStringList("Banned_Commands.Executed_Command");
-
-				new BukkitRunnable() {
-					public void run() {
-						plugin.getServer().dispatchCommand(plugin.getServer().getConsoleSender(), command);
-
-						for (String cmd : commands) {
-							plugin.getServer().dispatchCommand(plugin.getServer().getConsoleSender(), cmd.replace("{player}", player.getName()));
-						}
-					}
-				}.runTask(plugin);
+
+		if (!config.getBoolean("Banned_Commands.Execute_Command")) return;
+
+		if (!config.contains("Banned_Commands.Executed_Command")) return;
+
+		String command = config.getString("Banned_Commands.Executed_Command").replace("{player}", player.getName());
+		List<String> commands = config.getStringList("Banned_Commands.Executed_Command");
+
+		new BukkitRunnable() {
+			public void run() {
+				plugin.getServer().dispatchCommand(plugin.getServer().getConsoleSender(), command);
+
+				for (String cmd : commands) {
+					plugin.getServer().dispatchCommand(plugin.getServer().getConsoleSender(), cmd.replace("{player}", player.getName()));
+				}
 			}
-		}
+		}.runTask(plugin);
 	}
 }
\ No newline at end of file
diff --git a/paper/src/main/java/me/h1dd3nxn1nja/chatmanager/listeners/ListenerCaps.java b/paper/src/main/java/me/h1dd3nxn1nja/chatmanager/listeners/ListenerCaps.java
index a0288ac..7dcd83f 100644
--- a/paper/src/main/java/me/h1dd3nxn1nja/chatmanager/listeners/ListenerCaps.java
+++ b/paper/src/main/java/me/h1dd3nxn1nja/chatmanager/listeners/ListenerCaps.java
@@ -26,8 +26,7 @@ public void onChat(AsyncPlayerChatEvent event) {
 		Player player = event.getPlayer();
 		String message = event.getMessage();
 
-		if (!config.getBoolean("Anti_Caps.Enable") || plugin.api().getStaffChatData().containsUser(player.getUniqueId()))
-			return;
+		if (!config.getBoolean("Anti_Caps.Enable") || plugin.api().getStaffChatData().containsUser(player.getUniqueId())) return;
 
 		if (player.hasPermission("chatmanager.bypass.caps")) return;
 
diff --git a/paper/src/main/java/me/h1dd3nxn1nja/chatmanager/listeners/ListenerChatFormat.java b/paper/src/main/java/me/h1dd3nxn1nja/chatmanager/listeners/ListenerChatFormat.java
index 43c7692..7b5214f 100644
--- a/paper/src/main/java/me/h1dd3nxn1nja/chatmanager/listeners/ListenerChatFormat.java
+++ b/paper/src/main/java/me/h1dd3nxn1nja/chatmanager/listeners/ListenerChatFormat.java
@@ -31,31 +31,27 @@ public void onChatFormat(AsyncPlayerChatEvent event) {
 		Player player = event.getPlayer();
 		String message = event.getMessage();
 		String key = vaultSupport.getPermission().getPrimaryGroup(player);
-		String format = "";
-
-		if (config.getBoolean("Chat_Format.Enable")) {
-			if (config.getConfigurationSection("Chat_Format.Groups." + key) != null) {
-				format = config.getString("Chat_Format.Groups." + key + ".Format");
-			} else {
-				format = config.getString("Chat_Format.Default_Format");
-			}
-
-			format = setupPlaceholderAPI(player, format);
-			format = placeholderManager.setPlaceholders(player, format);
-			format = setupChatRadius(player, format);
-			format = Methods.color(format);
-			format = format.replace("{message}", message);
-			format = format.replaceAll("%", "%%");
-
-			event.setFormat(format);
-			event.setMessage(message);
-		}
+		String format;
+
+		if (!config.getBoolean("Chat_Format.Enable")) return;
+
+		format = config.getConfigurationSection("Chat_Format.Groups." + key) != null ? config.getString("Chat_Format.Groups." + key + ".Format") : config.getString("Chat_Format.Default_Format");
+
+		format = setupPlaceholderAPI(player, format);
+		format = placeholderManager.setPlaceholders(player, format);
+		format = setupChatRadius(player, format);
+		format = Methods.color(format);
+		format = format.replace("{message}", message);
+		format = format.replaceAll("%", "%%");
+
+		event.setFormat(format);
+		event.setMessage(message);
 	}
 
 	public String setupChatRadius(Player player, String message) {
 		FileConfiguration config = settingsManager.getConfig();
 		String placeholders = message;
-		
+
 		if (config.getBoolean("Chat_Radius.Enable")) {
 			if (plugin.api().getGlobalChatData().containsUser(player.getUniqueId())) placeholders = placeholders.replace("{radius}", config.getString("Chat_Radius.Global_Chat.Prefix"));
 
diff --git a/paper/src/main/java/me/h1dd3nxn1nja/chatmanager/listeners/ListenerColor.java b/paper/src/main/java/me/h1dd3nxn1nja/chatmanager/listeners/ListenerColor.java
index 3866f5c..28037dd 100644
--- a/paper/src/main/java/me/h1dd3nxn1nja/chatmanager/listeners/ListenerColor.java
+++ b/paper/src/main/java/me/h1dd3nxn1nja/chatmanager/listeners/ListenerColor.java
@@ -20,14 +20,13 @@ public class ListenerColor implements Listener {
 	
 	@EventHandler(priority = EventPriority.HIGHEST)
 	public void onColorChat(AsyncPlayerChatEvent event) {
-		
 		Player player = event.getPlayer();
 		String message = event.getMessage();
-		
-		if (settingsManager.getConfig().getBoolean("Formatted_Messages.Enable")) {
-			String format = formatChat(player, message);
-			event.setMessage(format);
-		}
+
+		if (!settingsManager.getConfig().getBoolean("Formatted_Messages.Enable")) return;
+
+		String format = formatChat(player, message);
+		event.setMessage(format);
 	}
 	
 	@EventHandler
diff --git a/paper/src/main/java/me/h1dd3nxn1nja/chatmanager/listeners/ListenerLogs.java b/paper/src/main/java/me/h1dd3nxn1nja/chatmanager/listeners/ListenerLogs.java
index d058515..58ca2ef 100644
--- a/paper/src/main/java/me/h1dd3nxn1nja/chatmanager/listeners/ListenerLogs.java
+++ b/paper/src/main/java/me/h1dd3nxn1nja/chatmanager/listeners/ListenerLogs.java
@@ -23,22 +23,22 @@ public class ListenerLogs implements Listener {
 	@EventHandler
 	public void onChat(AsyncPlayerChatEvent event) {
 		FileConfiguration config = settingsManager.getConfig();
-		
-		String playername = event.getPlayer().getName();
+
+		String playerName = event.getPlayer().getName();
 		String message = event.getMessage();
 		Date time = Calendar.getInstance().getTime();
-		
-		if (config.getBoolean("Logs.Log_Chat")) {
-			try {
-				FileWriter fw = new FileWriter(settingsManager.getChatLogs(), true);
-				BufferedWriter bw = new BufferedWriter(fw);
-				bw.write("[" + time + "] " + playername + ": " + message.replaceAll("§", "&"));
-				bw.newLine();
-				fw.flush();
-				bw.close();
-			} catch (Exception ex) {
-				ex.printStackTrace();
-			}
+
+		if (!config.getBoolean("Logs.Log_Chat")) return;
+
+		try {
+			FileWriter fw = new FileWriter(settingsManager.getChatLogs(), true);
+			BufferedWriter bw = new BufferedWriter(fw);
+			bw.write("[" + time + "] " + playerName + ": " + message.replaceAll("§", "&"));
+			bw.newLine();
+			fw.flush();
+			bw.close();
+		} catch (Exception ex) {
+			ex.printStackTrace();
 		}
 	}
 	
@@ -48,27 +48,27 @@ public void onPlayerCommand(PlayerCommandPreprocessEvent event) {
 
 		List<String> blacklist = config.getStringList("Logs.Blacklist_Commands");
 
-		String playername = event.getPlayer().getName();
+		String playerName = event.getPlayer().getName();
 		String message = event.getMessage();
 		Date time = Calendar.getInstance().getTime();
 
-		if (config.getBoolean("Logs.Log_Commands")) {
-			for (String command : blacklist) {
-				if (event.getMessage().toLowerCase().startsWith(command)) return;
-			}
+		if (!config.getBoolean("Logs.Log_Commands")) return;
 
-			if ((message.equals("/")) || (message.equals("//"))) return;
+		for (String command : blacklist) {
+			if (event.getMessage().toLowerCase().startsWith(command)) return;
+		}
 
-			try {
-				FileWriter fw = new FileWriter(settingsManager.getCommandLogs(), true);
-				BufferedWriter bw = new BufferedWriter(fw);
-				bw.write("[" + time + "] " + playername + ": " + message.replaceAll("§", "&"));
-				bw.newLine();
-				fw.flush();
-				bw.close();
-			} catch (Exception ex) {
-				ex.printStackTrace();
-			}
+		if ((message.equals("/")) || (message.equals("//"))) return;
+
+		try {
+			FileWriter fw = new FileWriter(settingsManager.getCommandLogs(), true);
+			BufferedWriter bw = new BufferedWriter(fw);
+			bw.write("[" + time + "] " + playerName + ": " + message.replaceAll("§", "&"));
+			bw.newLine();
+			fw.flush();
+			bw.close();
+		} catch (Exception ex) {
+			ex.printStackTrace();
 		}
 	}
 	
@@ -76,27 +76,27 @@ public void onPlayerCommand(PlayerCommandPreprocessEvent event) {
 	public void onSignChange(SignChangeEvent event) {
 		FileConfiguration config = settingsManager.getConfig();
 
-		String playername = event.getPlayer().getName();
+		String playerName = event.getPlayer().getName();
 		Date time = Calendar.getInstance().getTime();
 
 		for (int line = 0; line < 4; line++) {
 			String message = event.getLine(line);
-			
+
 			int X = event.getBlock().getLocation().getBlockX();
 			int Y = event.getBlock().getLocation().getBlockY();
 			int Z = event.getBlock().getLocation().getBlockZ();
 
-			if (config.getBoolean("Logs.Log_Signs")) {
-				try {
-					FileWriter fw = new FileWriter(settingsManager.getSignLogs(), true);
-					BufferedWriter bw = new BufferedWriter(fw);
-					bw.write("[" + time + "] " + playername + " | Location: X: " + X + " Y: " + Y + " Z: " + Z + " | Line: " + line + " | "+ message.replaceAll("§", "&"));
-					bw.newLine();
-					fw.flush();
-					bw.close();
-				} catch (Exception ex) {
-					ex.printStackTrace();
-				}
+			if (!config.getBoolean("Logs.Log_Signs")) return;
+
+			try {
+				FileWriter fw = new FileWriter(settingsManager.getSignLogs(), true);
+				BufferedWriter bw = new BufferedWriter(fw);
+				bw.write("[" + time + "] " + playerName + " | Location: X: " + X + " Y: " + Y + " Z: " + Z + " | Line: " + line + " | " + message.replaceAll("§", "&"));
+				bw.newLine();
+				fw.flush();
+				bw.close();
+			} catch (Exception ex) {
+				ex.printStackTrace();
 			}
 		}
 	}
diff --git a/paper/src/main/java/me/h1dd3nxn1nja/chatmanager/listeners/ListenerMentions.java b/paper/src/main/java/me/h1dd3nxn1nja/chatmanager/listeners/ListenerMentions.java
index 82b308a..eef71a9 100644
--- a/paper/src/main/java/me/h1dd3nxn1nja/chatmanager/listeners/ListenerMentions.java
+++ b/paper/src/main/java/me/h1dd3nxn1nja/chatmanager/listeners/ListenerMentions.java
@@ -41,16 +41,14 @@ public void onChat(AsyncPlayerChatEvent event) {
 		event.setMessage(Methods.color(event.getMessage()));
 
 		plugin.getServer().getOnlinePlayers().forEach(target -> {
-			if (!player.hasPermission("chatmanager.mention") || !target.hasPermission("chatmanager.mention.receive"))
-				return;
+			if (!player.hasPermission("chatmanager.mention") || !target.hasPermission("chatmanager.mention.receive")) return;
 
 			if (!event.getMessage().contains(tagSymbol + target.getName())) return;
 
 			if (plugin.api().getToggleMentionsData().containsUser(target.getUniqueId())) return;
 
 			if (PluginSupport.ESSENTIALS.isPluginEnabled()) {
-				if (essentialsSupport.isIgnored(target, player) || essentialsSupport.isMuted(player))
-					return;
+				if (essentialsSupport.isIgnored(target, player) || essentialsSupport.isMuted(player)) return;
 			}
 
 			if (plugin.api().getToggleChatData().containsUser(target.getUniqueId())) return;
diff --git a/paper/src/main/java/me/h1dd3nxn1nja/chatmanager/listeners/ListenerMuteChat.java b/paper/src/main/java/me/h1dd3nxn1nja/chatmanager/listeners/ListenerMuteChat.java
index 43bcbaa..9d71583 100644
--- a/paper/src/main/java/me/h1dd3nxn1nja/chatmanager/listeners/ListenerMuteChat.java
+++ b/paper/src/main/java/me/h1dd3nxn1nja/chatmanager/listeners/ListenerMuteChat.java
@@ -15,39 +15,33 @@ public class ListenerMuteChat implements Listener {
 	private final ChatManager plugin = ChatManager.getPlugin();
 
 	private final SettingsManager settingsManager = plugin.getSettingsManager();
-	
+
 	@EventHandler
 	public void muteChat(AsyncPlayerChatEvent event) {
 		FileConfiguration messages = settingsManager.getMessages();
-		
+
 		Player player = event.getPlayer();
-		
-		if (!player.hasPermission("chatmanager.bypass.mutechat")) {
-			if (Methods.getMuted()) {
-				Methods.sendMessage(player, messages.getString("Mute_Chat.Denied_Message"), true);
-				event.setCancelled(true);
-			}
-		}
+
+		if (player.hasPermission("chatmanager.bypass.mutechat") || !Methods.isMuted()) return;
+
+		Methods.sendMessage(player, messages.getString("Mute_Chat.Denied_Message"), true);
+		event.setCancelled(true);
 	}
-	
+
 	@EventHandler
 	public void onCommand(PlayerCommandPreprocessEvent event) {
 		FileConfiguration config = settingsManager.getConfig();
 		FileConfiguration messages = settingsManager.getMessages();
-		
+
 		Player player = event.getPlayer();
-		
-		if (config.getBoolean("Mute_Chat.Disable_Commands")) {
-			if (!player.hasPermission("chatmanager.bypass.mutechat")) {
-				if (Methods.getMuted()) {
-					for (String command : config.getStringList("Mute_Chat.Disabled_Commands")) {
-						if (event.getMessage().toLowerCase().contains(command)) {
-							Methods.sendMessage(player, messages.getString("Mute_Chat.Blocked_Commands.Message"), true);
-							event.setCancelled(true);
-							return;
-						}
-					}
-				}
+
+		if (!config.getBoolean("Mute_Chat.Disable_Commands") || player.hasPermission("chatmanager.bypass.mutechat") || !Methods.isMuted()) return;
+
+		for (String command : config.getStringList("Mute_Chat.Disabled_Commands")) {
+			if (event.getMessage().toLowerCase().contains(command)) {
+				Methods.sendMessage(player, messages.getString("Mute_Chat.Blocked_Commands.Message"), true);
+				event.setCancelled(true);
+				return;
 			}
 		}
 	}
diff --git a/paper/src/main/java/me/h1dd3nxn1nja/chatmanager/support/placeholders/PlaceholderAPISupport.java b/paper/src/main/java/me/h1dd3nxn1nja/chatmanager/support/placeholders/PlaceholderAPISupport.java
index 2413131..93d9a30 100644
--- a/paper/src/main/java/me/h1dd3nxn1nja/chatmanager/support/placeholders/PlaceholderAPISupport.java
+++ b/paper/src/main/java/me/h1dd3nxn1nja/chatmanager/support/placeholders/PlaceholderAPISupport.java
@@ -3,6 +3,7 @@
 import java.text.DecimalFormat;
 import me.h1dd3nxn1nja.chatmanager.SettingsManager;
 import org.bukkit.OfflinePlayer;
+import org.bukkit.craftbukkit.v1_19_R3.entity.CraftPlayer;
 import org.bukkit.entity.Player;
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
 import me.h1dd3nxn1nja.chatmanager.ChatManager;
@@ -33,24 +34,21 @@ public class PlaceholderAPISupport extends PlaceholderExpansion {
 					} else if (plugin.api().getWorldChatData().containsUser(player.getUniqueId())) {
 						return settingsManager.getConfig().getString("Chat_Radius.World_Chat.Prefix");
 					}
-				case "toggle_pm": //Returns if the toggle pm is enabled/disabled for a player.
+				case "toggle_pm": // Returns if the toggle pm is enabled/disabled for a player.
 					return plugin.api().getToggleMessageData().containsUser(player.getUniqueId()) ? "Enabled" : "Disabled";
-				case "toggle_chat": //Returns if the toggle chat is enabled/disabled for a player.
+				case "toggle_chat": // Returns if the toggle chat is enabled/disabled for a player.
 					return plugin.api().getToggleChatData().containsUser(player.getUniqueId()) ? "Enabled" : "Disabled";
-				case "command_spy": //Returns if the command spy is enabled/disabled for a player.
+				case "command_spy": // Returns if the command spy is enabled/disabled for a player.
 					return plugin.api().getCommandSpyData().containsUser(player.getUniqueId()) ? "Enabled" : "Disabled";
 				case "social_spy": // Returns if the social spy is enabled/disabled for a player.
 					return plugin.api().getSocialSpyData().containsUser(player.getUniqueId()) ? "Enabled" : "Disabled";
-				case "staff_chat": //Returns if the staff chat is enabled/disabled for a player.
+				case "staff_chat": // Returns if the staff chat is enabled/disabled for a player.
 					return plugin.api().getStaffChatData().containsUser(player.getUniqueId()) ? "Enabled" : "Disabled";
-				case "mute_chat": //Returns if mute chat is enabled/disabled.
-					if (Methods.getMuted()) {
-						return "Enabled";
-					} else {
-						return "Disabled";
-					}
-				//case "ping":
-				//	return df.format(playerOnline.);
+				case "mute_chat": // Returns if mute chat is enabled/disabled.
+					return Methods.isMuted() ? "Enabled" : "Disabled";
+				case "ping":
+					CraftPlayer craftPlayer = (CraftPlayer) playerOnline;
+					return df.format(craftPlayer.getPing());
 				default:
 					return "";
 			}
@@ -66,7 +64,7 @@ public boolean persist() {
 
 	@Override
 	public @NotNull String getIdentifier() {
-		return "chatmanager";
+		return plugin.getName().toLowerCase();
 	}
 
 	@Override