diff --git a/Plan/src/main/java/com/djrapitops/plan/Log.java b/Plan/src/main/java/com/djrapitops/plan/Log.java
index e218366f9..3215a1a09 100644
--- a/Plan/src/main/java/com/djrapitops/plan/Log.java
+++ b/Plan/src/main/java/com/djrapitops/plan/Log.java
@@ -77,7 +77,6 @@ public class Log {
      * @param messages All messages to add to the debug log.
      * @return full debug complex so far.
      */
-    @SafeVarargs
     public static DebugInfo debug(String task, String... messages) {
         DebugInfo debug = getDebug(task);
         long time = MiscUtils.getTime();
diff --git a/Plan/src/main/java/com/djrapitops/plan/database/sql/Select.java b/Plan/src/main/java/com/djrapitops/plan/database/sql/Select.java
index 54bdbd029..44290f9f7 100644
--- a/Plan/src/main/java/com/djrapitops/plan/database/sql/Select.java
+++ b/Plan/src/main/java/com/djrapitops/plan/database/sql/Select.java
@@ -27,11 +27,11 @@ public class Select extends SqlParser {
 
     public Select where(String... conditions) {
         append(" WHERE ");
-        for (int i = 0; i < conditions.length; i++) {
+        for (String condition : conditions) {
             if (this.conditions > 0) {
                 append(" AND ");
             }
-            append("(").append(conditions[i]).append(")");
+            append("(").append(condition).append(")");
             this.conditions++;
         }
         return this;
diff --git a/Plan/src/main/java/com/djrapitops/plan/ui/html/tables/PlayersTableCreator.java b/Plan/src/main/java/com/djrapitops/plan/ui/html/tables/PlayersTableCreator.java
index f9fb368c2..860edc65b 100644
--- a/Plan/src/main/java/com/djrapitops/plan/ui/html/tables/PlayersTableCreator.java
+++ b/Plan/src/main/java/com/djrapitops/plan/ui/html/tables/PlayersTableCreator.java
@@ -66,9 +66,14 @@ public class PlayersTableCreator {
     }
 
     private static String getActivityString(boolean isBanned, boolean isUnknown, boolean isActive) {
-        return isBanned ? "Banned"
-                : (isUnknown ? "Unknown"
-                : (isActive ? "Active"
-                : "Inactive"));
+        if (isBanned) {
+            return "Banned";
+        }
+
+        if (isUnknown) {
+            return "Unknown";
+        }
+
+        return isActive ? "Active" : "Inactive";
     }
 }
diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/file/dump/DumpLog.java b/Plan/src/main/java/com/djrapitops/plan/utilities/file/dump/DumpLog.java
index ff9f92403..6d83af7cb 100644
--- a/Plan/src/main/java/com/djrapitops/plan/utilities/file/dump/DumpLog.java
+++ b/Plan/src/main/java/com/djrapitops/plan/utilities/file/dump/DumpLog.java
@@ -18,8 +18,7 @@ public class DumpLog {
      * @param header The name of the header
      */
     public void addHeader(String header) {
-        addLine("");
-        addLine("--- " + header + " ---");
+        addLines("", "--- " + header + " ---");
     }
 
     /**
diff --git a/Plan/test/test/java/main/java/com/djrapitops/plan/SettingsTest.java b/Plan/test/test/java/main/java/com/djrapitops/plan/SettingsTest.java
index e591641df..139ea0deb 100644
--- a/Plan/test/test/java/main/java/com/djrapitops/plan/SettingsTest.java
+++ b/Plan/test/test/java/main/java/com/djrapitops/plan/SettingsTest.java
@@ -74,5 +74,4 @@ public class SettingsTest {
     public void testGetPath() {
         assertEquals("Settings.WebServer.Enabled", Settings.WEBSERVER_ENABLED.getPath());
     }
-
 }
diff --git a/Plan/test/test/java/main/java/com/djrapitops/plan/data/cache/queue/DataCacheQueueTest.java b/Plan/test/test/java/main/java/com/djrapitops/plan/data/cache/queue/DataCacheQueueTest.java
index 0a51a584a..93f0f0f15 100644
--- a/Plan/test/test/java/main/java/com/djrapitops/plan/data/cache/queue/DataCacheQueueTest.java
+++ b/Plan/test/test/java/main/java/com/djrapitops/plan/data/cache/queue/DataCacheQueueTest.java
@@ -106,14 +106,11 @@ public class DataCacheQueueTest {
     public void testGetQueue_cache() {
         List<Integer> calls = new ArrayList<>();
         List<Integer> errors = new ArrayList<>();
-        handler.getUserDataForProcessing(new DBCallableProcessor() {
-            @Override
-            public void process(UserData data) {
-                if (data.equals(data1)) {
-                    calls.add(1);
-                } else {
-                    errors.add(1);
-                }
+        handler.getUserDataForProcessing(data -> {
+            if (data.equals(data1)) {
+                calls.add(1);
+            } else {
+                errors.add(1);
             }
         }, uuid1);
         while (calls.size() < 1) {
@@ -131,14 +128,11 @@ public class DataCacheQueueTest {
     public void testGetQueue_dontCache() {
         List<Integer> getCalls = new ArrayList<>();
         List<Integer> errors = new ArrayList<>();
-        handler.getUserDataForProcessing(new DBCallableProcessor() {
-            @Override
-            public void process(UserData data) {
-                if (data.equals(data1)) {
-                    getCalls.add(1);
-                } else {
-                    errors.add(1);
-                }
+        handler.getUserDataForProcessing(data -> {
+            if (data.equals(data1)) {
+                getCalls.add(1);
+            } else {
+                errors.add(1);
             }
         }, uuid1, false);
         while (getCalls.size() < 1) {
diff --git a/Plan/test/test/java/main/java/com/djrapitops/plan/utilities/analysis/MathUtilsTest.java b/Plan/test/test/java/main/java/com/djrapitops/plan/utilities/analysis/MathUtilsTest.java
index 96ca6279e..c2bccf330 100644
--- a/Plan/test/test/java/main/java/com/djrapitops/plan/utilities/analysis/MathUtilsTest.java
+++ b/Plan/test/test/java/main/java/com/djrapitops/plan/utilities/analysis/MathUtilsTest.java
@@ -10,6 +10,7 @@ import org.junit.Test;
 
 import java.io.Serializable;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Random;
 
@@ -46,7 +47,7 @@ public class MathUtilsTest {
      */
     @Test
     public void testAverageIntEmpty() {
-        List<Integer> l = new ArrayList<>();
+        List<Integer> l = Collections.emptyList();
         double exp = 0;
         double result = MathUtils.averageInt(l.stream());
         assertTrue(result + "/" + exp, Double.compare(exp, result) == 0);
diff --git a/Plan/test/test/java/main/java/com/djrapitops/plan/utilities/dump/HastebinTest.java b/Plan/test/test/java/main/java/com/djrapitops/plan/utilities/dump/HastebinTest.java
index be4618503..c0601f67a 100644
--- a/Plan/test/test/java/main/java/com/djrapitops/plan/utilities/dump/HastebinTest.java
+++ b/Plan/test/test/java/main/java/com/djrapitops/plan/utilities/dump/HastebinTest.java
@@ -46,7 +46,6 @@ public class HastebinTest {
                 /* Ignored */
             }
 
-            Log.info(link);
             testLink.set(link);
         });
 
diff --git a/Plan/test/test/java/utils/TestInit.java b/Plan/test/test/java/utils/TestInit.java
index c24d4c9af..fe6af2826 100644
--- a/Plan/test/test/java/utils/TestInit.java
+++ b/Plan/test/test/java/utils/TestInit.java
@@ -139,7 +139,7 @@ public class TestInit {
 
                     @Override
                     public ITask runTask() {
-                        new Thread(() -> runnable.run()).start();
+                        new Thread(runnable::run).start();
                         return null;
                     }