diff --git a/src/main/java/dev/plex/Guilds.java b/src/main/java/dev/plex/Guilds.java
index b98258a..dd0811b 100644
--- a/src/main/java/dev/plex/Guilds.java
+++ b/src/main/java/dev/plex/Guilds.java
@@ -38,10 +38,10 @@ public class Guilds extends PlexModule
     @Override
     public void enable()
     {
-        if (getPlex().getStorageType() == StorageType.MONGODB)
+        if (Plex.get().getStorageType() == StorageType.MONGODB)
         {
-            getPlex().getMongoConnection().getDatastore().getMapper().map(Guild.class);
-            getPlex().getMongoConnection().getDatastore().ensureIndexes();
+            Plex.get().getMongoConnection().getDatastore().getMapper().map(Guild.class);
+            Plex.get().getMongoConnection().getDatastore().ensureIndexes();
         }
         else
         {
@@ -55,44 +55,43 @@ public class Guilds extends PlexModule
             });
         }
 
-        this.getPlex().setChatHandler(new ChatHandlerImpl());
+        Plex.get().setChatHandler(new ChatHandlerImpl());
 
+        addDefaultMessage("guildsHelpCommand", "<gradient:gold:yellow>======</gradient>Guild Menu<gradient:gold:yellow>======</gradient><newline><newline>{0}", "0 - The commands list");
+        addDefaultMessage("guildsCommandDisplay", "<gold>{0} <yellow>{1}", "0 - The command name", "1 - The command description");
+        addDefaultMessage("guildCommandNotFound", "<red>'<gold>{0}</gold>'<red> is not a valid sub command!", "0 - The sub command");
+        addDefaultMessage("guildNotFound", "<red>You're currently not a part of a guild!");
+        addDefaultMessage("guildInThis", "<red>You're currently a part of this guild!");
+        addDefaultMessage("alreadyInGuild", "<red>You're currently in a guild. Please do <gold>/guild leave<red> if you're a member, or if you're an owner with members, <gold>/guild promote <player><red> then <gold>/guild leave<red>, or just an owner, <gold>/guild disband<red>.");
+        addDefaultMessage("guildNotOwner", "<red>You're not the owner of this guild!");
+        addDefaultMessage("guildMemberNotFound", "<red>This guild member could not be found!");
+        addDefaultMessage("guildOwnerSet", "<green>You have successfully promoted <dark_green>{0}<green> to be the new guild owner. You have been set to a default guild member.");
 
-        this.addDefaultMessage("guildsHelpCommand", "<gradient:gold:yellow>======</gradient>Guild Menu<gradient:gold:yellow>======</gradient><newline><newline>{0}", "0 - The commands list");
-        this.addDefaultMessage("guildsCommandDisplay", "<gold>{0} <yellow>{1}", "0 - The command name", "1 - The command description");
-        this.addDefaultMessage("guildCommandNotFound", "<red>'<gold>{0}</gold>'<red> is not a valid sub command!", "0 - The sub command");
-        this.addDefaultMessage("guildNotFound", "<red>You're currently not a part of a guild!");
-        this.addDefaultMessage("guildInThis", "<red>You're currently a part of this guild!");
-        this.addDefaultMessage("alreadyInGuild", "<red>You're currently in a guild. Please do <gold>/guild leave<red> if you're a member, or if you're an owner with members, <gold>/guild promote <player><red> then <gold>/guild leave<red>, or just an owner, <gold>/guild disband<red>.");
-        this.addDefaultMessage("guildNotOwner", "<red>You're not the owner of this guild!");
-        this.addDefaultMessage("guildMemberNotFound", "<red>This guild member could not be found!");
-        this.addDefaultMessage("guildOwnerSet", "<green>You have successfully promoted <dark_green>{0}<green> to be the new guild owner. You have been set to a default guild member.");
+        addDefaultMessage("guildPrefixSet", "<green>You have changed the guild prefix to '<gold>{0}</gold><green>'", "0 - The new prefix");
+        addDefaultMessage("guildPrefixCleared", "<green>Your guild's prefix has been cleared.");
 
-        this.addDefaultMessage("guildPrefixSet", "<green>You have changed the guild prefix to '<gold>{0}</gold><green>'", "0 - The new prefix");
-        this.addDefaultMessage("guildPrefixCleared", "<green>Your guild's prefix has been cleared.");
+        addDefaultMessage("guildWarpAlphanumeric", "<red>Warp names may only contain alphabetical and/or numerical characters.");
+        addDefaultMessage("guildWarpExists", "<red>'<gold>{0}</gold>'<red> is already an existing warp!", "0 - The warp name");
+        addDefaultMessage("guildWarpNotFound", "<red>'<gold>{0}</gold>'<red> is not a valid warp!", "0 - The warp name");
+        addDefaultMessage("guildWarpCreated", "<green>You have created a warp called '<dark_green>{0}</dark_green><green>'", "0 - The warp name");
 
-        this.addDefaultMessage("guildWarpAlphanumeric", "<red>Warp names may only contain alphabetical and/or numerical characters.");
-        this.addDefaultMessage("guildWarpExists", "<red>'<gold>{0}</gold>'<red> is already an existing warp!", "0 - The warp name");
-        this.addDefaultMessage("guildWarpNotFound", "<red>'<gold>{0}</gold>'<red> is not a valid warp!", "0 - The warp name");
-        this.addDefaultMessage("guildWarpCreated", "<green>You have created a warp called '<dark_green>{0}</dark_green><green>'", "0 - The warp name");
+        addDefaultMessage("guildHomeRemoved", "<green>You have removed the guild's home!");
+        addDefaultMessage("guildHomeSet", "<green>You have changed the guild's home!");
+        addDefaultMessage("guildHomeNotFound", "<red>This guild currently has no home set.");
 
-        this.addDefaultMessage("guildHomeRemoved", "<green>You have removed the guild's home!");
-        this.addDefaultMessage("guildHomeSet", "<green>You have changed the guild's home!");
-        this.addDefaultMessage("guildHomeNotFound", "<red>This guild currently has no home set.");
+        addDefaultMessage("guildChatMessage", "<blue>[GUILD] <aqua>{0} <yellow>{1}", "0 - The player name", "1 - The message");
+        addDefaultMessage("guildChatToggled", "<green>Your chat has been toggled {0}", "0 - On / Off");
+        addDefaultMessage("guildChatConsoleLog", "<blue>[GUILD - {0}:{1}] <aqua>{2} <yellow>{3}", "0 - The guild name", "1 - The guild unique identifier", "2 - The player name", "3 - The message");
 
-        this.addDefaultMessage("guildChatMessage", "<blue>[GUILD] <aqua>{0} <yellow>{1}", "0 - The player name", "1 - The message");
-        this.addDefaultMessage("guildChatToggled", "<green>Your chat has been toggled {0}", "0 - On / Off");
-        this.addDefaultMessage("guildChatConsoleLog", "<blue>[GUILD - {0}:{1}] <aqua>{2} <yellow>{3}", "0 - The guild name", "1 - The guild unique identifier", "2 - The player name", "3 - The message");
-
-        this.addDefaultMessage("guildNoInvite", "<red>You don't have any pending invitations!");
-        this.addDefaultMessage("guildNotValidInvite", "<red>You don't have an invite from this guild!");
-        this.addDefaultMessage("guildInviteExists", "<red>You've already sent an invite to this person!");
-        this.addDefaultMessage("guildInviteSent", "<green>You have sent an invite to <dark_green>{0}", "0 - The invitee");
-        this.addDefaultMessage("guildInviteReceived", "<gold>You have received an invite from <yellow>{0}<gold> for the guild <yellow>{1}<newline><newline><green><bold><click:run_command:/guild invite accept {1}>[ACCEPT]<newline><newline><!bold><gold>You may also run <yellow>/guild invite accept {1}<gold> to accept this invite. It will expire in 5 minutes", "0 - The inviter", "1 - The guild name");
-        this.addDefaultMessage("guildMemberJoined", "<green>{0} has joined the guild!", "0 - The player who joined");
-        this.addDefaultMessage("guildMemberLeft", "<green>{0} has left the guild!", "0 - The player who left");
-        this.addDefaultMessage("guildDisbandNeeded", "<red>You need to disband your guild using <gold>/guild disband<red> or promote a new owner using <gold>/guild owner <player>");
-        this.addDefaultMessage("guildAutoDisbanded", "<green>Auto-disbanding your guild since there were no members");
+        addDefaultMessage("guildNoInvite", "<red>You don't have any pending invitations!");
+        addDefaultMessage("guildNotValidInvite", "<red>You don't have an invite from this guild!");
+        addDefaultMessage("guildInviteExists", "<red>You've already sent an invite to this person!");
+        addDefaultMessage("guildInviteSent", "<green>You have sent an invite to <dark_green>{0}", "0 - The invitee");
+        addDefaultMessage("guildInviteReceived", "<gold>You have received an invite from <yellow>{0}<gold> for the guild <yellow>{1}<newline><newline><green><bold><click:run_command:/guild invite accept {1}>[ACCEPT]<newline><newline><!bold><gold>You may also run <yellow>/guild invite accept {1}<gold> to accept this invite. It will expire in 5 minutes", "0 - The inviter", "1 - The guild name");
+        addDefaultMessage("guildMemberJoined", "<green>{0} has joined the guild!", "0 - The player who joined");
+        addDefaultMessage("guildMemberLeft", "<green>{0} has left the guild!", "0 - The player who left");
+        addDefaultMessage("guildDisbandNeeded", "<red>You need to disband your guild using <gold>/guild disband<red> or promote a new owner using <gold>/guild owner <player>");
+        addDefaultMessage("guildAutoDisbanded", "<green>Auto-disbanding your guild since there were no members");
     }
 
     @Override
@@ -103,28 +102,6 @@ public class Guilds extends PlexModule
         this.getPlex().setChatHandler(new ChatListener.ChatHandlerImpl());
     }
 
-    private void addDefaultMessage(String message, Object initValue)
-    {
-        if (Plex.get().messages.getString(message) == null)
-        {
-            Plex.get().messages.set(message, initValue);
-            Plex.get().messages.save();
-            PlexLog.debug("'{0}' message added from TFMExtras module", message);
-        }
-    }
-
-    private void addDefaultMessage(String message, Object initValue, String... comments)
-    {
-        if (Plex.get().messages.getString(message) == null)
-        {
-            Plex.get().messages.set(message, initValue);
-            Plex.get().messages.save();
-            Plex.get().messages.setComments(message, Arrays.asList(comments));
-            Plex.get().messages.save();
-            PlexLog.debug("'{0}' message added from Plex-Guilds module", message);
-        }
-    }
-
     public static Guilds get()
     {
         return module;