diff --git a/.github/ISSUE_TEMPLATE/1-bug.md b/.github/ISSUE_TEMPLATE/1-bug.md
index adcf1f1..d2adf25 100644
--- a/.github/ISSUE_TEMPLATE/1-bug.md
+++ b/.github/ISSUE_TEMPLATE/1-bug.md
@@ -5,7 +5,7 @@ labels: Bug
 ---
 <!--
 
-⚠️ READ BELOW BEFOR SUBMITTING ⚠️
+⚠️ READ BELOW BEFORE SUBMITTING ⚠️
 
 Before opening a bug report:
  * Read the FAQ: https://filoghost.me/docs/chest-commands/faq
diff --git a/.github/ISSUE_TEMPLATE/2-feature.md b/.github/ISSUE_TEMPLATE/2-feature.md
index 161bf4c..fb8c37f 100644
--- a/.github/ISSUE_TEMPLATE/2-feature.md
+++ b/.github/ISSUE_TEMPLATE/2-feature.md
@@ -5,7 +5,7 @@ labels: Enhancement
 ---
 <!--
 
-⚠️ READ BELOW BEFOR SUBMITTING ⚠️
+⚠️ READ BELOW BEFORE SUBMITTING ⚠️
 
 Please only suggest changes that would benefit many users, not just a specific situation.
 
diff --git a/.github/ISSUE_TEMPLATE/3-help.md b/.github/ISSUE_TEMPLATE/3-help.md
index c165bb1..ac7215a 100644
--- a/.github/ISSUE_TEMPLATE/3-help.md
+++ b/.github/ISSUE_TEMPLATE/3-help.md
@@ -5,7 +5,7 @@ labels: Help
 ---
 <!--
 
-⚠️ READ BELOW BEFOR SUBMITTING ⚠️
+⚠️ READ BELOW BEFORE SUBMITTING ⚠️
 
 Before asking for help:
  * Read the documentation: https://filoghost.me/docs/chest-commands
diff --git a/.github/ISSUE_TEMPLATE/4-documentation.md b/.github/ISSUE_TEMPLATE/4-documentation.md
index d132baf..5b5b267 100644
--- a/.github/ISSUE_TEMPLATE/4-documentation.md
+++ b/.github/ISSUE_TEMPLATE/4-documentation.md
@@ -5,7 +5,7 @@ labels: Documentation
 ---
 <!--
 
-⚠️ READ BELOW BEFOR SUBMITTING ⚠️
+⚠️ READ BELOW BEFORE SUBMITTING ⚠️
 
 You MUST fill out the template below, without modifying or deleting the existing text, otherwise the issue will be automatically closed.
 
diff --git a/Plugin/src/main/java/me/filoghost/chestcommands/action/PlaySoundAction.java b/Plugin/src/main/java/me/filoghost/chestcommands/action/PlaySoundAction.java
index bb038b1..365d5b2 100644
--- a/Plugin/src/main/java/me/filoghost/chestcommands/action/PlaySoundAction.java
+++ b/Plugin/src/main/java/me/filoghost/chestcommands/action/PlaySoundAction.java
@@ -45,6 +45,7 @@ public class PlaySoundAction extends Action {
 			try {
 				pitch = Float.parseFloat(split[1]);
 			} catch (NumberFormatException e) {
+				// TODO
 			}
 		}
 
@@ -52,6 +53,7 @@ public class PlaySoundAction extends Action {
 			try {
 				volume = Float.parseFloat(split[2]);
 			} catch (NumberFormatException e) {
+				// TODO
 			}
 		}
 	}
diff --git a/Plugin/src/main/java/me/filoghost/chestcommands/command/CommandHandler.java b/Plugin/src/main/java/me/filoghost/chestcommands/command/CommandHandler.java
index ab13883..9699710 100644
--- a/Plugin/src/main/java/me/filoghost/chestcommands/command/CommandHandler.java
+++ b/Plugin/src/main/java/me/filoghost/chestcommands/command/CommandHandler.java
@@ -84,7 +84,7 @@ public class CommandHandler extends CommandFramework {
 			CommandValidate.isTrue(sender.hasPermission(Permissions.COMMAND_BASE + "open"), "You don't have permission.");
 			CommandValidate.minLength(args, 2, "Usage: /" + label + " open <menu> [player]");
 
-			Player target = null;
+			Player target;
 
 			if (sender instanceof Player) {
 				if (args.length > 2) {
diff --git a/Plugin/src/main/java/me/filoghost/chestcommands/config/AsciiPlaceholders.java b/Plugin/src/main/java/me/filoghost/chestcommands/config/AsciiPlaceholders.java
index 6db3dc4..cf97e94 100644
--- a/Plugin/src/main/java/me/filoghost/chestcommands/config/AsciiPlaceholders.java
+++ b/Plugin/src/main/java/me/filoghost/chestcommands/config/AsciiPlaceholders.java
@@ -41,6 +41,7 @@ public class AsciiPlaceholders {
 	public static void load(ErrorCollector errorCollector) throws IOException, Exception {
 
 		placeholders.clear();
+
 		File file = new File(ChestCommands.getInstance().getDataFolder(), "placeholders.yml");
 
 		if (!file.exists()) {
diff --git a/Plugin/src/main/java/me/filoghost/chestcommands/config/Lang.java b/Plugin/src/main/java/me/filoghost/chestcommands/config/Lang.java
index 9f7f7b6..85ea656 100644
--- a/Plugin/src/main/java/me/filoghost/chestcommands/config/Lang.java
+++ b/Plugin/src/main/java/me/filoghost/chestcommands/config/Lang.java
@@ -14,7 +14,6 @@
  */
 package me.filoghost.chestcommands.config;
 
-import me.filoghost.chestcommands.config.yaml.PluginConfig;
 import me.filoghost.chestcommands.config.yaml.SpecialConfig;
 
 public class Lang extends SpecialConfig {
diff --git a/Plugin/src/main/java/me/filoghost/chestcommands/config/Settings.java b/Plugin/src/main/java/me/filoghost/chestcommands/config/Settings.java
index dc6d1b1..08e7f97 100644
--- a/Plugin/src/main/java/me/filoghost/chestcommands/config/Settings.java
+++ b/Plugin/src/main/java/me/filoghost/chestcommands/config/Settings.java
@@ -14,7 +14,6 @@
  */
 package me.filoghost.chestcommands.config;
 
-import me.filoghost.chestcommands.config.yaml.PluginConfig;
 import me.filoghost.chestcommands.config.yaml.SpecialConfig;
 
 public class Settings extends SpecialConfig {
diff --git a/Plugin/src/main/java/me/filoghost/chestcommands/config/yaml/SpecialConfig.java b/Plugin/src/main/java/me/filoghost/chestcommands/config/yaml/SpecialConfig.java
index bedafaf..36dda70 100644
--- a/Plugin/src/main/java/me/filoghost/chestcommands/config/yaml/SpecialConfig.java
+++ b/Plugin/src/main/java/me/filoghost/chestcommands/config/yaml/SpecialConfig.java
@@ -14,15 +14,11 @@
  */
 package me.filoghost.chestcommands.config.yaml;
 
-import me.filoghost.chestcommands.ChestCommands;
-import me.filoghost.chestcommands.legacy.ConfigConverter;
 import me.filoghost.chestcommands.util.FormatUtils;
-import org.bukkit.configuration.InvalidConfigurationException;
 
 import java.io.IOException;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
-import java.nio.file.Files;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
diff --git a/Plugin/src/main/java/me/filoghost/chestcommands/menu/icon/PermissionChecker.java b/Plugin/src/main/java/me/filoghost/chestcommands/menu/icon/PermissionChecker.java
index 9fef005..99b2c72 100644
--- a/Plugin/src/main/java/me/filoghost/chestcommands/menu/icon/PermissionChecker.java
+++ b/Plugin/src/main/java/me/filoghost/chestcommands/menu/icon/PermissionChecker.java
@@ -35,7 +35,7 @@ public class PermissionChecker implements Requirement {
 			negated = false;
 		} else {
 			if (permission.startsWith("-")) {
-				this.permission = permission.substring(1, permission.length());
+				this.permission = permission.substring(1);
 				negated = true;
 			} else {
 				this.permission = permission;
diff --git a/Plugin/src/main/java/me/filoghost/chestcommands/menu/settings/ClickType.java b/Plugin/src/main/java/me/filoghost/chestcommands/menu/settings/ClickType.java
index 6765eb6..008ad30 100644
--- a/Plugin/src/main/java/me/filoghost/chestcommands/menu/settings/ClickType.java
+++ b/Plugin/src/main/java/me/filoghost/chestcommands/menu/settings/ClickType.java
@@ -25,9 +25,9 @@ public enum ClickType {
 	public static ClickType fromOptions(boolean left, boolean right) {
 		if (left && right) {
 			return BOTH;
-		} else if (left && !right) {
+		} else if (left) {
 			return LEFT;
-		} else if (!left && right) {
+		} else if (right) {
 			return RIGHT;
 		} else {
 			return null;
diff --git a/Plugin/src/main/java/me/filoghost/chestcommands/parser/ItemMetaParser.java b/Plugin/src/main/java/me/filoghost/chestcommands/parser/ItemMetaParser.java
index c98183c..cb8ec85 100644
--- a/Plugin/src/main/java/me/filoghost/chestcommands/parser/ItemMetaParser.java
+++ b/Plugin/src/main/java/me/filoghost/chestcommands/parser/ItemMetaParser.java
@@ -67,7 +67,7 @@ public final class ItemMetaParser {
 	}
 
 	public static List<Pattern> parseBannerPatternList(List<String> input) throws ParseException {
-		List<Pattern> patterns = new ArrayList<Pattern>();
+		List<Pattern> patterns = new ArrayList<>();
 		for (String str : input) {
 			String[] split = Strings.trimmedSplit(str, ":");
 			if (split.length != 2) {
diff --git a/Plugin/src/main/java/me/filoghost/chestcommands/parser/ItemStackParser.java b/Plugin/src/main/java/me/filoghost/chestcommands/parser/ItemStackParser.java
index 2ef0734..240ff09 100644
--- a/Plugin/src/main/java/me/filoghost/chestcommands/parser/ItemStackParser.java
+++ b/Plugin/src/main/java/me/filoghost/chestcommands/parser/ItemStackParser.java
@@ -23,7 +23,7 @@ import me.filoghost.chestcommands.util.Strings;
 
 public class ItemStackParser {
 
-	private Material material = Material.STONE; // In the worst case (bad exception handling) we just get stone
+	private final Material material;
 	private int amount = 1;
 	private short durability = 0;
 	private boolean hasExplicitDurability = false;
diff --git a/Plugin/src/main/java/me/filoghost/chestcommands/util/CaseInsensitiveMap.java b/Plugin/src/main/java/me/filoghost/chestcommands/util/CaseInsensitiveMap.java
index 75d436d..a995b58 100644
--- a/Plugin/src/main/java/me/filoghost/chestcommands/util/CaseInsensitiveMap.java
+++ b/Plugin/src/main/java/me/filoghost/chestcommands/util/CaseInsensitiveMap.java
@@ -22,7 +22,7 @@ public class CaseInsensitiveMap<V> extends HashMap<String, V> {
 	private static final long serialVersionUID = 4712822893326841081L;
 
 	public static <K> CaseInsensitiveMap<K> create() {
-		return new CaseInsensitiveMap<K>();
+		return new CaseInsensitiveMap<>();
 	}
 
 	@Override
diff --git a/Plugin/src/main/java/me/filoghost/chestcommands/util/Strings.java b/Plugin/src/main/java/me/filoghost/chestcommands/util/Strings.java
index 3a3fdc0..46b45cc 100644
--- a/Plugin/src/main/java/me/filoghost/chestcommands/util/Strings.java
+++ b/Plugin/src/main/java/me/filoghost/chestcommands/util/Strings.java
@@ -66,22 +66,22 @@ public final class Strings {
 		String s = input.toLowerCase();
 
 		int strLen = s.length();
-		StringBuffer buffer = new StringBuffer(strLen);
+		StringBuilder output = new StringBuilder(strLen);
 		boolean capitalizeNext = true;
 		for (int i = 0; i < strLen; i++) {
 			char ch = s.charAt(i);
 
 			if (Character.isWhitespace(ch)) {
-				buffer.append(ch);
+				output.append(ch);
 				capitalizeNext = true;
 			} else if (capitalizeNext) {
-				buffer.append(Character.toTitleCase(ch));
+				output.append(Character.toTitleCase(ch));
 				capitalizeNext = false;
 			} else {
-				buffer.append(ch);
+				output.append(ch);
 			}
 		}
-		return buffer.toString();
+		return output.toString();
 	}
 
 	public static boolean isNullOrEmpty(String s) {
diff --git a/Plugin/src/main/java/me/filoghost/chestcommands/util/nbt/NBTCompound.java b/Plugin/src/main/java/me/filoghost/chestcommands/util/nbt/NBTCompound.java
index 0d3ff58..57cacba 100644
--- a/Plugin/src/main/java/me/filoghost/chestcommands/util/nbt/NBTCompound.java
+++ b/Plugin/src/main/java/me/filoghost/chestcommands/util/nbt/NBTCompound.java
@@ -14,11 +14,11 @@ public final class NBTCompound extends NBTTag {
 	private final Map<String, NBTTag> value;
 
 	public NBTCompound(Map<String, NBTTag> value) {
-		this.value = new LinkedHashMap<String, NBTTag>(value);
+		this.value = new LinkedHashMap<>(value);
 	}
 
 	public NBTCompound() {
-		this.value = new LinkedHashMap<String, NBTTag>();
+		this.value = new LinkedHashMap<>();
 	}
 
 	// GETTERS
diff --git a/Plugin/src/main/java/me/filoghost/chestcommands/util/nbt/NBTList.java b/Plugin/src/main/java/me/filoghost/chestcommands/util/nbt/NBTList.java
index fcaa067..d5d07ad 100644
--- a/Plugin/src/main/java/me/filoghost/chestcommands/util/nbt/NBTList.java
+++ b/Plugin/src/main/java/me/filoghost/chestcommands/util/nbt/NBTList.java
@@ -9,7 +9,7 @@ public final class NBTList extends NBTTag implements Iterable<NBTTag>, Cloneable
 
 	private NBTType type;
 
-	private final List<NBTTag> list = new ArrayList<NBTTag>();
+	private final List<NBTTag> list = new ArrayList<>();
 
 	/**
 	 * Creates the list with a type and a series of elements.
diff --git a/Plugin/src/main/java/me/filoghost/chestcommands/util/nbt/parser/MojangsonParser.java b/Plugin/src/main/java/me/filoghost/chestcommands/util/nbt/parser/MojangsonParser.java
index 5ecd6f9..d390aea 100644
--- a/Plugin/src/main/java/me/filoghost/chestcommands/util/nbt/parser/MojangsonParser.java
+++ b/Plugin/src/main/java/me/filoghost/chestcommands/util/nbt/parser/MojangsonParser.java
@@ -230,7 +230,7 @@ public final class MojangsonParser {
 	}
 
 	private Number[] parseNumArray(NBTType arrayType, NBTType primType) throws MojangsonParseException {
-		List<Number> result = new ArrayList<Number>();
+		List<Number> result = new ArrayList<>();
 		while (currentChar() != ']') {
 			NBTTag element = parseAnything();
 			NBTType elementType = element.getType();
@@ -254,7 +254,7 @@ public final class MojangsonParser {
 		}
 		expectChar(']');
 
-		return result.toArray(new Number[result.size()]);
+		return result.toArray(new Number[0]);
 	}
 
 	// CHARACTER NAVIGATION
diff --git a/Plugin/src/main/java/me/filoghost/chestcommands/variable/RelativeStringList.java b/Plugin/src/main/java/me/filoghost/chestcommands/variable/RelativeStringList.java
index b2862b8..df3c92f 100644
--- a/Plugin/src/main/java/me/filoghost/chestcommands/variable/RelativeStringList.java
+++ b/Plugin/src/main/java/me/filoghost/chestcommands/variable/RelativeStringList.java
@@ -18,7 +18,7 @@ public class RelativeStringList {
 		if (list != null) {
 			this.originalList = ImmutableList.copyOf(list);
 			this.relativeList = Utils.transform(list, RelativeString::of);
-			this.hasVariables = this.relativeList.stream().anyMatch(element -> element.hasVariables());
+			this.hasVariables = this.relativeList.stream().anyMatch(RelativeString::hasVariables);
 		} else {
 			this.originalList = null;
 			this.relativeList = null;