diff --git a/src/main/java/fr/xephi/authme/AuthMe.java b/src/main/java/fr/xephi/authme/AuthMe.java
index 69112ea2..c253ca5b 100644
--- a/src/main/java/fr/xephi/authme/AuthMe.java
+++ b/src/main/java/fr/xephi/authme/AuthMe.java
@@ -96,7 +96,7 @@ public class AuthMe extends JavaPlugin {
     public boolean delayedAntiBot = true;
 
     // Hooks TODO: move into modules
-    public Permission vaultGroupManagement;
+    public Permission vaultGroupManagement; // TODO: Remove this instance, and replace every usage with permissions manager!
     public Essentials ess;
     public MultiverseCore multiverse;
     public CombatTagPlus combatTagPlus;
diff --git a/src/main/java/fr/xephi/authme/DataManager.java b/src/main/java/fr/xephi/authme/DataManager.java
index c808ebc5..edc96eee 100644
--- a/src/main/java/fr/xephi/authme/DataManager.java
+++ b/src/main/java/fr/xephi/authme/DataManager.java
@@ -177,8 +177,7 @@ public class DataManager {
      * @param cleared List<String>
      * @param permission Permission
      */
-    public synchronized void purgePermissions(List<String> cleared,
-            Permission permission) {
+    public synchronized void purgePermissions(List<String> cleared, Permission permission) {
         int i = 0;
         for (String name : cleared) {
             try {
diff --git a/src/main/java/fr/xephi/authme/settings/Settings.java b/src/main/java/fr/xephi/authme/settings/Settings.java
index a8da9f5e..94f032d8 100644
--- a/src/main/java/fr/xephi/authme/settings/Settings.java
+++ b/src/main/java/fr/xephi/authme/settings/Settings.java
@@ -545,14 +545,14 @@ public final class Settings extends YamlConfiguration {
         try {
             return DataSource.DataSourceType.valueOf(configFile.getString(key, "sqlite").toUpperCase());
         } catch (IllegalArgumentException ex) {
-            ConsoleLogger.showError("Unknown database backend; defaulting to sqlite database");
+            ConsoleLogger.showError("Unknown database backend; defaulting to SQLite database");
             return DataSource.DataSourceType.SQLITE;
         }
     }
 
     /**
      * Config option for setting and check restricted user by username;ip ,
-     * return false if ip and name doesnt amtch with player that join the
+     * return false if ip and name doesn't match with player that join the
      * server, so player has a restricted access
      * @param name String
      * @param ip String
@@ -560,21 +560,21 @@ public final class Settings extends YamlConfiguration {
      * @return boolean */
     public static boolean getRestrictedIp(String name, String ip) {
 
-        Iterator<String> iter = getRestrictedIp.iterator();
-        boolean trueonce = false;
-        boolean namefound = false;
-        while (iter.hasNext()) {
-            String[] args = iter.next().split(";");
-            String testname = args[0];
-            String testip = args[1];
-            if (testname.equalsIgnoreCase(name)) {
-                namefound = true;
-                if (testip.equalsIgnoreCase(ip)) {
-                    trueonce = true;
+        Iterator<String> iterator = getRestrictedIp.iterator();
+        boolean trueOnce = false;
+        boolean nameFound = false;
+        while(iterator.hasNext()) {
+            String[] args = iterator.next().split(";");
+            String testName = args[0];
+            String testIp = args[1];
+            if (testName.equalsIgnoreCase(name)) {
+                nameFound = true;
+                if (testIp.equalsIgnoreCase(ip)) {
+                    trueOnce = true;
                 }
             }
         }
-        return !namefound || trueonce;
+        return !nameFound || trueOnce;
     }
 
     /**
@@ -651,7 +651,7 @@ public final class Settings extends YamlConfiguration {
                 BufferedWriter w = new BufferedWriter(fw);
                 w.write("Welcome {PLAYER} on {SERVER} server");
                 w.newLine();
-                w.write("This server use AuthMe protection!");
+                w.write("This server uses " + AuthMe.PLUGIN_NAME + " protection!");
                 w.close();
             } catch (IOException e) {
                 e.printStackTrace();