diff --git a/src/main/resources/storage/messages.json b/src/main/resources/storage/messages.json
index d6306c0..c2b6645 100644
--- a/src/main/resources/storage/messages.json
+++ b/src/main/resources/storage/messages.json
@@ -1,71 +1,65 @@
 {
   "error.not_a_player": "<red>You must be a player to execute this command!</red>",
   "error.already_in_clan": "<red>You are already in a clan!</red>",
-  "usage.clan_create": "<red>Usage: /clan create <name> <tag></red>",
-  "success.clan_created": "<green>Clan created successfully!</green>",
-  "usage.clan_chat": "<red>Usage: /clan chat <message></red>",
   "error.not_in_clan_chat": "<red>You are not in a clan!</red>",
-  "usage.clan_join": "<red>Usage: /clan join <clanName></red>",
   "error.clan_not_found": "<red>Clan not found!</red>",
   "error.already_requested": "<yellow>You have already requested to join this clan.</yellow>",
-  "success.join_request_sent": "<green>Join request sent to clan %s!</green>",
   "error.player_not_online": "<red>Player %s is not online!</red>",
   "error.player_already_in_clan": "<red>%s is already in a clan!</red>",
-  "success.invite_sent": "<green>Invite sent to %s.</green>",
-  "notification.invite": "<yellow>Invite from clan %s.</yellow>",
-  "button.accept": "<green>[Accept]</green>",
-  "button.deny": "<red>[Deny]</red>",
-  "usage.clan_invite": "<red>Usage: /clan invite <playerName></red>",
   "error.not_authorized_invite": "<red>You are not authorized to invite players to a clan!</red>",
-  "usage.clan_accept": "<red>Usage: /clan accept <clanName></red>",
   "error.invite_not_found": "<red>No invite found from clan %s.</red>",
-  "success.join_clan": "<green>You have joined the clan %s!</green>",
-  "success.invite_accepted_notify": "<green>%s has accepted the clan invite.</green>",
-  "usage.clan_accept_request": "<red>Usage: /clan accept <playerName></red>",
   "error.no_join_requests": "<red>No join requests available.</red>",
   "error.join_request_not_found": "<red>No join request found from %s.</red>",
-  "success.join_request_accepted": "<green>You have accepted %s's join request.</green>",
-  "success.join_request_accepted_notify": "<green>Your join request for clan %s has been accepted.</green>",
-  "usage.clan_deny_invite": "<red>Usage: /clan deny <clanName></red>",
-  "error.invite_declined": "<red>You have declined the clan invite from %s.</red>",
-  "error.invite_declined_notify": "<red>%s has declined the clan invite.</red>",
-  "usage.clan_deny_request": "<red>Usage: /clan deny <playerName></red>",
-  "error.join_request_denied": "<red>You have denied %s's join request.</red>",
-  "error.join_request_denied_notify": "<red>Your join request for clan %s has been denied.</red>",
-  "error.no_clans": "<red>No clans found!</red>",
-  "error.not_in_clan_info": "<red>You are not in a clan!</red>",
-  "error.clan_not_found_info": "<red>Could not find your clan.</red>",
-  "error.not_authorized_kick": "<red>You are not authorized to kick players.</red>",
-  "usage.clan_kick": "<red>Usage: /clan kick <playerName></red>",
-  "error.player_not_found": "<red>No such player found.</red>",
   "error.player_not_in_clan": "<red>%s is not in your clan!</red>",
   "error.cannot_kick_leader": "<red>You cannot kick the clan leader!</red>",
-  "success.player_kicked": "<green>You kicked %s from the clan.</green>",
-  "error.player_kicked_notify": "<red>You have been kicked from the clan %s.</red>",
   "error.only_leader_transfer": "<red>Only the clan leader can transfer leadership.</red>",
-  "usage.clan_transfer": "<red>Usage: /clan transfer <playerName></red>",
-  "success.leadership_transferred": "<green>You transferred leadership to %s.</green>",
-  "success.new_leader_notify": "<green>You are now the leader of the clan %s.</green>",
   "error.only_leader_promote": "<red>Only the clan leader can promote a member.</red>",
-  "usage.clan_promote": "<red>Usage: /clan promote <playerName></red>",
   "error.already_vice": "<red>%s is already the vice!</red>",
-  "success.promoted_to_vice": "<green>You promoted %s to vice leader.</green>",
-  "success.promoted_notify": "<green>You have been promoted to vice leader of clan %s.</green>",
   "error.not_authorized_demote": "<red>You are not authorized to demote anyone.</red>",
-  "usage.clan_demote": "<red>Usage: /clan demote <playerName></red>",
   "error.not_vice": "<red>%s is not the vice leader!</red>",
   "error.only_self_demote": "<red>You can only demote yourself!</red>",
-  "success.demoted": "<green>You demoted %s to a normal member.</green>",
-  "error.demoted_notify": "<red>You have been demoted to a normal member of clan %s.</red>",
   "error.only_leader_disband": "<red>Only the clan leader can disband the clan.</red>",
   "error.leader_cannot_leave": "<red>You must transfer leadership or disband the clan before leaving.</red>",
-  "success.clan_disbanded_leave": "<green>You have disbanded your clan (no other members) and left.</green>",
-  "success.left_clan": "<green>You have left the clan %s.</green>",
   "error.only_leader_modify": "<red>Only the clan leader can modify clan settings.</red>",
-  "usage.clan_modify": "<red>Usage: /clan modify <name|tag> <newValue></red>",
   "error.modify_invalid": "<red>You can only modify 'name' or 'tag'.</red>",
   "error.unknown_subcommand": "<red>Unknown subcommand. Use /clan for help.</red>",
   "error.clan_disbanded_notify": "<red>Your clan %s has been disbanded by the leader.</red>",
+
+  "usage.clan_create": "<red>Usage: /clan create <name> <tag></red>",
+  "usage.clan_chat": "<red>Usage: /clan chat <message></red>",
+  "usage.clan_join": "<red>Usage: /clan join <clanName></red>",
+  "usage.clan_invite": "<red>Usage: /clan invite <playerName></red>",
+  "usage.clan_accept": "<red>Usage: /clan accept <clanName></red>",
+  "usage.clan_accept_request": "<red>Usage: /clan accept <playerName></red>",
+  "usage.clan_deny_invite": "<red>Usage: /clan deny <clanName></red>",
+  "usage.clan_deny_request": "<red>Usage: /clan deny <playerName></red>",
+  "usage.clan_kick": "<red>Usage: /clan kick <playerName></red>",
+  "usage.clan_transfer": "<red>Usage: /clan transfer <playerName></red>",
+  "usage.clan_promote": "<red>Usage: /clan promote <playerName></red>",
+  "usage.clan_demote": "<red>Usage: /clan demote <playerName></red>",
+  "usage.clan_modify": "<red>Usage: /clan modify <name|tag> <newValue></red>",
+
+  "success.clan_created": "<green>Clan created successfully!</green>",
+  "success.join_request_sent": "<green>Join request sent to clan %s!</green>",
+  "success.invite_sent": "<green>Invite sent to %s.</green>",
+  "success.join_clan": "<green>You have joined the clan %s!</green>",
+  "success.invite_accepted_notify": "<green>%s has accepted the clan invite.</green>",
+  "success.join_request_accepted": "<green>You have accepted %s's join request.</green>",
+  "success.join_request_accepted_notify": "<green>Your join request for clan %s has been accepted.</green>",
+  "success.player_kicked": "<green>You kicked %s from the clan.</green>",
+  "success.leadership_transferred": "<green>You transferred leadership to %s.</green>",
+  "success.new_leader_notify": "<green>You are now the leader of the clan %s.</green>",
+  "success.promoted_to_vice": "<green>You promoted %s to vice leader.</green>",
+  "success.promoted_notify": "<green>You have been promoted to vice leader of clan %s.</green>",
+  "success.demoted": "<green>You demoted %s to a normal member.</green>",
+  "success.clan_disbanded_leave": "<green>You have disbanded your clan (no other members) and left.</green>",
+  "success.left_clan": "<green>You have left the clan %s.</green>",
+
+  "notification.invite": "<yellow>Invite from clan %s.</yellow>",
+
+  "button.accept": "<green>[Accept]</green>",
+  "button.deny": "<red>[Deny]</red>",
+
   "help.leader": "<color:#c70088>=== Clan Commands ===</color>\n<color:#c70088>-</color> <hover:show_text:'Displays clan info'><click:run_command:'/clan info'><color:#10abc7>/clan info</color></click></hover>\n<color:#c70088>-</color> <hover:show_text:'Invite a player'><click:run_command:'/clan invite'><color:#10abc7>/clan invite</color></click></hover>\n<color:#c70088>-</color> <hover:show_text:'Kick a player'><click:run_command:'/clan kick'><color:#10abc7>/clan kick</color></click></hover>\n<color:#c70088>-</color> <hover:show_text:'Transfer leadership'><click:run_command:'/clan transfer'><color:#10abc7>/clan transfer</color></click></hover>\n<color:#c70088>-</color> <hover:show_text:'Promote a member'><click:run_command:'/clan promote'><color:#10abc7>/clan promote</color></click></hover>\n<color:#c70088>-</color> <hover:show_text:'Demote the vice leader'><click:run_command:'/clan demote'><color:#10abc7>/clan demote</color></click></hover>\n<color:#c70088>-</color> <hover:show_text:'Disband your clan'><click:run_command:'/clan disband'><color:#10abc7>/clan disband</color></click></hover>\n<color:#c70088>-</color> <hover:show_text:'Leave your clan'><click:run_command:'/clan leave'><color:#10abc7>/clan leave</color></click></hover>\n<color:#c70088>-</color> <hover:show_text:'Accept a join request'><click:run_command:'/clan accept'><color:#10abc7>/clan accept</color></click></hover>\n<color:#c70088>-</color> <hover:show_text:'Deny a join request'><click:run_command:'/clan deny'><color:#10abc7>/clan deny</color></click></hover>\n<color:#c70088>-</color> <hover:show_text:'Modify clan name or tag'><click:run_command:'/clan modify'><color:#10abc7>/clan modify</color></click></hover>\n<color:#c70088>-</color> <hover:show_text:'Show a list of all clans'><click:run_command:'/clan list'><color:#10abc7>/clan list</color></click></hover>\n<color:#c70088>=====================</color>",
   "help.vice": "<color:#c70088>=== Clan Commands ===</color>\n<color:#c70088>-</color> <hover:show_text:'Displays clan info'><click:run_command:'/clan info'><color:#10abc7>/clan info</color></click></hover>\n<color:#c70088>-</color> <hover:show_text:'Invite a player'><click:run_command:'/clan invite'><color:#10abc7>/clan invite</color></click></hover>\n<color:#c70088>-</color> <hover:show_text:'Kick a player'><click:run_command:'/clan kick'><color:#10abc7>/clan kick</color></click></hover>\n<color:#c70088>-</color> <hover:show_text:'Demote the vice leader'><click:run_command:'/clan demote'><color:#10abc7>/clan demote</color></click></hover>\n<color:#c70088>-</color> <hover:show_text:'Leave your clan'><click:run_command:'/clan leave'><color:#10abc7>/clan leave</color></click></hover>\n<color:#c70088>-</color> <hover:show_text:'Accept a join request'><click:run_command:'/clan accept'><color:#10abc7>/clan accept</color></click></hover>\n<color:#c70088>-</color> <hover:show_text:'Deny a join request'><click:run_command:'/clan deny'><color:#10abc7>/clan deny</color></click></hover>\n<color:#c70088>-</color> <hover:show_text:'Show a list of all clans'><click:run_command:'/clan list'><color:#10abc7>/clan list</color></click></hover>\n<color:#c70088>=====================</color>",
   "help.member": "<color:#c70088>=== Clan Commands ===</color>\n<color:#c70088>-</color> <hover:show_text:'Displays clan info'><click:run_command:'/clan info'><color:#10abc7>/clan info</color></click></hover>\n<color:#c70088>-</color> <hover:show_text:'Leave your clan'><click:run_command:'/clan leave'><color:#10abc7>/clan leave</color></click></hover>\n<color:#c70088>-</color> <hover:show_text:'Show a list of all clans'><click:run_command:'/clan list'><color:#10abc7>/clan list</color></click></hover>\n<color:#c70088>=====================</color>",