diff --git a/src/main/java/rip/crystal/practice/game/ffa/command/FFACommand.java b/src/main/java/rip/crystal/practice/game/ffa/command/FFACommand.java
index c031f310..b1601259 100644
--- a/src/main/java/rip/crystal/practice/game/ffa/command/FFACommand.java
+++ b/src/main/java/rip/crystal/practice/game/ffa/command/FFACommand.java
@@ -1,15 +1,13 @@
 package rip.crystal.practice.game.ffa.command;
-/* 
-   Made by cpractice Development Team
-   Created on 27.11.2021
-*/
 
 import org.bukkit.entity.Player;
+import rip.crystal.practice.Locale;
 import rip.crystal.practice.api.command.BaseCommand;
 import rip.crystal.practice.api.command.Command;
 import rip.crystal.practice.api.command.CommandArgs;
 import rip.crystal.practice.game.ffa.command.subcommands.FFAJoinCommand;
 import rip.crystal.practice.game.ffa.command.subcommands.FFALeaveCommand;
+import rip.crystal.practice.utilities.MessageFormat;
 import rip.crystal.practice.utilities.chat.CC;
 
 public class FFACommand extends BaseCommand {
@@ -25,8 +23,7 @@ public void onCommand(CommandArgs commandArgs) {
         Player player = commandArgs.getPlayer();
         String[] args = commandArgs.getArgs();
         if (args.length == 0) {
-            player.sendMessage(CC.translate(("&9/ffa leave &7- &fLeave FFA")));
-            player.sendMessage(CC.translate(("&9/ffa join &7- &fJoin FFA")));
+            new MessageFormat(Locale.FFA_COMMAND_ARGS.format(profile.getLocale()));
         }
     }
 }
diff --git a/src/main/java/rip/crystal/practice/player/queue/Queue.java b/src/main/java/rip/crystal/practice/player/queue/Queue.java
index 97bcfbef..e105a216 100644
--- a/src/main/java/rip/crystal/practice/player/queue/Queue.java
+++ b/src/main/java/rip/crystal/practice/player/queue/Queue.java
@@ -56,18 +56,12 @@ public void addPlayer(Player player, int elo) {
 		Hotbar.giveHotbarItems(player);
 
 		if (ranked) {
-			//player.sendMessage(Locale.QUEUE_JOIN_RANKED.format(kit.getName(), elo));
 			new MessageFormat(Locale.QUEUE_JOIN_RANKED.format(profile.getLocale()))
 				.add("<kit_name>", kit.getName())
 				.add("<elo>", String.valueOf(elo))
 				.send(player);
 		} else {
-			//player.sendMessage(Locale.QUEUE_JOIN_UNRANKED.format(kit.getName()));
-
-			//for (String message : cPractice.get().getLang().getStringList("QUEUE.JOIN_UNRANKED")) {
 			new MessageFormat(Locale.QUEUE_JOIN_UNRANKED.format(profile.getLocale())).add("<kit_name>", kit.getName()).add("<pingrange>", "" + (profile.getPingRange() == -1 ? "Unrestricted" : Integer.valueOf(profile.getPingRange()))).send(player);
-			//}
-			//new MessageFormat(Locale.QUEUE_JOIN_UNRANKED.format(profile.getLocale())).add("<kit_name>", kit.getName()).send(player);
 		}
 	}
 
@@ -84,12 +78,10 @@ public void removePlayer(QueueProfile queueProfile) {
 			Hotbar.giveHotbarItems(player);
 
 			if (ranked) {
-				//player.sendMessage(Locale.QUEUE_LEAVE_RANKED.format(kit.getName()));
 				new MessageFormat(Locale.QUEUE_LEAVE_RANKED.format(profile.getLocale()))
 					.add("<kit_name>", kit.getName())
 					.send(player);
 			} else {
-				//player.sendMessage(Locale.QUEUE_LEAVE_UNRANKED.format(kit.getName()));
 				new MessageFormat(Locale.QUEUE_LEAVE_UNRANKED.format(profile.getLocale()))
 					.add("<kit_name>", kit.getName())
 					.send(player);