diff --git a/src/main/java/fr/xephi/authme/command/CommandHandler.java b/src/main/java/fr/xephi/authme/command/CommandHandler.java
index 2fdd722d..dfff17d1 100644
--- a/src/main/java/fr/xephi/authme/command/CommandHandler.java
+++ b/src/main/java/fr/xephi/authme/command/CommandHandler.java
@@ -26,10 +26,8 @@ public class CommandHandler {
     private final CommandService commandService;
     private final PermissionsManager permissionsManager;
 
-    /**
-     * Create a command handler.
-     * 
-     * @param commandService The CommandService instance
+    /*
+     * Constructor.
      */
     @Inject
     public CommandHandler(CommandService commandService, PermissionsManager permissionsManager) {
diff --git a/src/main/java/fr/xephi/authme/events/LoginEvent.java b/src/main/java/fr/xephi/authme/events/LoginEvent.java
index d36dcc1a..eb38d626 100644
--- a/src/main/java/fr/xephi/authme/events/LoginEvent.java
+++ b/src/main/java/fr/xephi/authme/events/LoginEvent.java
@@ -31,8 +31,9 @@ public class LoginEvent extends CustomEvent {
     }
 
     /**
+     * Ensures compatibility with plugins like GuiRules.
      *
-     * @return
+     * @return true
      * @deprecated this will always return true because this event is only called if it was successful
      */
     @Deprecated
diff --git a/src/main/java/fr/xephi/authme/permission/PermissionsManager.java b/src/main/java/fr/xephi/authme/permission/PermissionsManager.java
index 2c94d6f6..14234e1f 100644
--- a/src/main/java/fr/xephi/authme/permission/PermissionsManager.java
+++ b/src/main/java/fr/xephi/authme/permission/PermissionsManager.java
@@ -69,6 +69,7 @@ public class PermissionsManager implements PermissionsService {
      * Constructor.
      *
      * @param server Server instance
+     * @param pluginManager Bukkit plugin manager
      */
     @Inject
     public PermissionsManager(Server server, PluginManager pluginManager) {
diff --git a/src/main/java/fr/xephi/authme/settings/NewSetting.java b/src/main/java/fr/xephi/authme/settings/NewSetting.java
index 89717a8c..90719daa 100644
--- a/src/main/java/fr/xephi/authme/settings/NewSetting.java
+++ b/src/main/java/fr/xephi/authme/settings/NewSetting.java
@@ -1,6 +1,8 @@
 package fr.xephi.authme.settings;
 
 import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Joiner;
+import com.google.common.base.Strings;
 import com.google.common.io.Files;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.settings.domain.Property;
@@ -121,10 +123,20 @@ public class NewSetting {
         return "/messages/messages_en.yml";
     }
 
+    /**
+     * Return the text to use in email registrations.
+     *
+     * @return The email message
+     */
     public String getEmailMessage() {
         return emailMessage;
     }
 
+    /**
+     * Return the lines to output after an in-game registration.
+     *
+     * @return The welcome message
+     */
     public List<String> getWelcomeMessage() {
         return welcomeMessage;
     }
@@ -206,7 +218,7 @@ public class NewSetting {
 
     private <T> String toYaml(Property<T> property, int indent, Yaml simpleYaml, Yaml singleQuoteYaml) {
         String representation = property.toYaml(configuration, simpleYaml, singleQuoteYaml);
-        return join("\n" + indent(indent), representation.split("\\n"));
+        return Joiner.on("\n" + indent(indent)).join(representation.split("\\n"));
     }
 
     private File buildMessagesFile() {
@@ -251,7 +263,7 @@ public class NewSetting {
         final Charset charset = Charset.forName("UTF-8");
         if (copyFileFromResource(emailFile, "email.html")) {
             try {
-                return StringUtils.join("\n", Files.readLines(emailFile, charset));
+                return Files.toString(emailFile, charset);
             } catch (IOException e) {
                 ConsoleLogger.logException("Failed to read file '" + emailFile.getPath() + "':", e);
             }
@@ -269,23 +281,9 @@ public class NewSetting {
         return new Yaml(options);
     }
 
-    private static String join(String delimiter, String[] items) {
-        StringBuilder sb = new StringBuilder();
-        String delim = "";
-        for (String item : items) {
-            sb.append(delim).append(item);
-            delim = delimiter;
-        }
-        return sb.toString();
-    }
-
     private static String indent(int level) {
         // We use an indentation of 4 spaces
-        StringBuilder sb = new StringBuilder(level * 4);
-        for (int i = 0; i < level; ++i) {
-            sb.append("    ");
-        }
-        return sb.toString();
+        return Strings.repeat(" ", level * 4);
     }
 
 }