diff --git a/commandapi-core/src/main/java/dev/jorel/commandapi/AbstractArgumentTree.java b/commandapi-core/src/main/java/dev/jorel/commandapi/AbstractArgumentTree.java
index a510841a98..810b23b218 100644
--- a/commandapi-core/src/main/java/dev/jorel/commandapi/AbstractArgumentTree.java
+++ b/commandapi-core/src/main/java/dev/jorel/commandapi/AbstractArgumentTree.java
@@ -122,7 +122,7 @@ public <Source> void buildBrigadierNode(
 			// Collect children into our own list
 			NodeInformation<CommandSender, Source> newPreviousNodeInformation = new NodeInformation<>(
 				previousNodeInformation.lastCommandNodes(), 
-				children -> childrenNodeInformation.addAll(children)
+				childrenNodeInformation::addAll
 			);
 
 			// We need a new list so each branch acts independently
diff --git a/commandapi-core/src/main/java/dev/jorel/commandapi/AbstractCommandAPICommand.java b/commandapi-core/src/main/java/dev/jorel/commandapi/AbstractCommandAPICommand.java
index 81db8a8bbe..8f2cfb12fd 100644
--- a/commandapi-core/src/main/java/dev/jorel/commandapi/AbstractCommandAPICommand.java
+++ b/commandapi-core/src/main/java/dev/jorel/commandapi/AbstractCommandAPICommand.java
@@ -245,7 +245,7 @@ protected <Source> List<RegisteredCommand.Node<CommandSender>> createArgumentNod
 
 		// Create arguments
 		if (hasAnyArguments()) {
-			NodeInformation<CommandSender, Source> previousNodeInformation = new NodeInformation<>(List.of(rootNode), children -> childrenNodes.addAll(children));
+			NodeInformation<CommandSender, Source> previousNodeInformation = new NodeInformation<>(List.of(rootNode), childrenNodes::addAll);
 			List<Argument> previousArguments = new ArrayList<>();
 			List<String> previousArgumentNames = new ArrayList<>();
 
diff --git a/commandapi-core/src/main/java/dev/jorel/commandapi/AbstractCommandTree.java b/commandapi-core/src/main/java/dev/jorel/commandapi/AbstractCommandTree.java
index 4ba7fb0a09..70f53dae99 100644
--- a/commandapi-core/src/main/java/dev/jorel/commandapi/AbstractCommandTree.java
+++ b/commandapi-core/src/main/java/dev/jorel/commandapi/AbstractCommandTree.java
@@ -103,7 +103,7 @@ protected <Source> List<RegisteredCommand.Node<CommandSender>> createArgumentNod
 		// Build branches
 		for (AbstractArgumentTree<?, Argument, CommandSender> argument : arguments) {
 			// We need new previousArguments lists for each branch so they don't interfere
-			NodeInformation<CommandSender, Source> previousNodeInformation = new NodeInformation<>(List.of(rootNode), children -> childrenNodes.addAll(children));
+			NodeInformation<CommandSender, Source> previousNodeInformation = new NodeInformation<>(List.of(rootNode), childrenNodes::addAll);
 			List<Argument> previousArguments = new ArrayList<>();
 			List<String> previousArgumentNames = new ArrayList<>();
 
diff --git a/commandapi-core/src/main/java/dev/jorel/commandapi/commandnodes/PreviewableArgumentBuilder.java b/commandapi-core/src/main/java/dev/jorel/commandapi/commandnodes/PreviewableArgumentBuilder.java
index ad6d11f950..e5e7a16145 100644
--- a/commandapi-core/src/main/java/dev/jorel/commandapi/commandnodes/PreviewableArgumentBuilder.java
+++ b/commandapi-core/src/main/java/dev/jorel/commandapi/commandnodes/PreviewableArgumentBuilder.java
@@ -65,7 +65,7 @@ public String getName() {
 	}
 
 	public PreviewableCommandNode<Source, T> build() {
-		final PreviewableCommandNode<Source, T> result = new PreviewableCommandNode<Source, T>(
+		final PreviewableCommandNode<Source, T> result = new PreviewableCommandNode<>(
             previewableFunction, legacy, isListed, 
             getName(), getType(),
 			getCommand(), getRequirement(), getRedirect(), getRedirectModifier(), isFork(), getSuggestionsProvider()
diff --git a/commandapi-core/src/main/java/dev/jorel/commandapi/help/EditableHelpTopic.java b/commandapi-core/src/main/java/dev/jorel/commandapi/help/EditableHelpTopic.java
index 4a47f1c003..367275a966 100644
--- a/commandapi-core/src/main/java/dev/jorel/commandapi/help/EditableHelpTopic.java
+++ b/commandapi-core/src/main/java/dev/jorel/commandapi/help/EditableHelpTopic.java
@@ -12,7 +12,7 @@
  * An {@link CommandAPIHelpTopic} that can have its short description, full description, and usage edited.
  */
 public class EditableHelpTopic<CommandSender> implements CommandAPIHelpTopic<CommandSender> {
-    private ShortDescriptionGenerator shortDescription = () -> Optional.empty();
+    private ShortDescriptionGenerator shortDescription = Optional::empty;
     private FullDescriptionGenerator<CommandSender> fullDescription = forWho -> Optional.empty();
     private UsageGenerator<CommandSender> usage = (forWho, argumentTree) -> Optional.empty();
 
diff --git a/commandapi-kotlin/commandapi-bukkit-kotlin/src/main/kotlin/dev/jorel/commandapi/kotlindsl/CommandTreeDSL.kt b/commandapi-kotlin/commandapi-bukkit-kotlin/src/main/kotlin/dev/jorel/commandapi/kotlindsl/CommandTreeDSL.kt
index 07b06ed38e..e4e92522c5 100644
--- a/commandapi-kotlin/commandapi-bukkit-kotlin/src/main/kotlin/dev/jorel/commandapi/kotlindsl/CommandTreeDSL.kt
+++ b/commandapi-kotlin/commandapi-bukkit-kotlin/src/main/kotlin/dev/jorel/commandapi/kotlindsl/CommandTreeDSL.kt
@@ -84,7 +84,7 @@ inline fun CommandTree.lootTableArgument(nodeName: String, block: Argument<*>.()
 inline fun CommandTree.mathOperationArgument(nodeName: String, block: Argument<*>.() -> Unit = {}): CommandTree = then(MathOperationArgument(nodeName).apply(block))
 inline fun CommandTree.namespacedKeyArgument(nodeName: String, block: Argument<*>.() -> Unit = {}): CommandTree = then(NamespacedKeyArgument(nodeName).apply(block))
 inline fun CommandTree.particleArgument(nodeName: String, block: Argument<*>.() -> Unit = {}): CommandTree = then(ParticleArgument(nodeName).apply(block))
-inline fun CommandTree.potionEffectArgument(nodeName: String, useNamespacedKey: Boolean = false, optional: Boolean = false, block: Argument<*>.() -> Unit = {}): CommandTree =
+inline fun CommandTree.potionEffectArgument(nodeName: String, useNamespacedKey: Boolean = false, block: Argument<*>.() -> Unit = {}): CommandTree =
 	if (useNamespacedKey) then(PotionEffectArgument.NamespacedKey(nodeName).apply(block)) else then(PotionEffectArgument(nodeName).apply(block))
 inline fun CommandTree.recipeArgument(nodeName: String, block: Argument<*>.() -> Unit = {}): CommandTree = then(RecipeArgument(nodeName).apply(block))
 
@@ -188,7 +188,7 @@ inline fun Argument<*>.lootTableArgument(nodeName: String, block: Argument<*>.()
 inline fun Argument<*>.mathOperationArgument(nodeName: String, block: Argument<*>.() -> Unit = {}): Argument<*> = then(MathOperationArgument(nodeName).apply(block))
 inline fun Argument<*>.namespacedKeyArgument(nodeName: String, block: Argument<*>.() -> Unit = {}): Argument<*> = then(NamespacedKeyArgument(nodeName).apply(block))
 inline fun Argument<*>.particleArgument(nodeName: String, block: Argument<*>.() -> Unit = {}): Argument<*> = then(ParticleArgument(nodeName).apply(block))
-inline fun Argument<*>.potionEffectArgument(nodeName: String, useNamespacedKey: Boolean = false, optional: Boolean = false, block: Argument<*>.() -> Unit = {}): Argument<*> =
+inline fun Argument<*>.potionEffectArgument(nodeName: String, useNamespacedKey: Boolean = false, block: Argument<*>.() -> Unit = {}): Argument<*> =
 	if (useNamespacedKey) then(PotionEffectArgument.NamespacedKey(nodeName).apply(block)) else then(PotionEffectArgument(nodeName).apply(block))
 inline fun Argument<*>.recipeArgument(nodeName: String, block: Argument<*>.() -> Unit = {}): Argument<*> = then(RecipeArgument(nodeName).apply(block))
 
diff --git a/commandapi-platforms/commandapi-bukkit/commandapi-bukkit-test/commandapi-bukkit-test-tests/src/test/java/dev/jorel/commandapi/test/arguments/ArgumentLiteralTests.java b/commandapi-platforms/commandapi-bukkit/commandapi-bukkit-test/commandapi-bukkit-test-tests/src/test/java/dev/jorel/commandapi/test/arguments/ArgumentLiteralTests.java
index f1d3e272ec..89edf2061c 100644
--- a/commandapi-platforms/commandapi-bukkit/commandapi-bukkit-test/commandapi-bukkit-test-tests/src/test/java/dev/jorel/commandapi/test/arguments/ArgumentLiteralTests.java
+++ b/commandapi-platforms/commandapi-bukkit/commandapi-bukkit-test/commandapi-bukkit-test-tests/src/test/java/dev/jorel/commandapi/test/arguments/ArgumentLiteralTests.java
@@ -83,7 +83,7 @@ void executionTestWithLiteralArgumentListed() {
 	}
 
 	@Test
-	public void executionTestWithLiteralArgumentListedAndNodeName() {
+	void executionTestWithLiteralArgumentListedAndNodeName() {
 		Mut<String> results = Mut.of();
 
 		new CommandAPICommand("test")
diff --git a/commandapi-platforms/commandapi-bukkit/commandapi-bukkit-test/commandapi-bukkit-test-tests/src/test/java/dev/jorel/commandapi/test/arguments/ArgumentMultiLiteralTests.java b/commandapi-platforms/commandapi-bukkit/commandapi-bukkit-test/commandapi-bukkit-test-tests/src/test/java/dev/jorel/commandapi/test/arguments/ArgumentMultiLiteralTests.java
index 16b6f7e71f..b72f375311 100644
--- a/commandapi-platforms/commandapi-bukkit/commandapi-bukkit-test/commandapi-bukkit-test-tests/src/test/java/dev/jorel/commandapi/test/arguments/ArgumentMultiLiteralTests.java
+++ b/commandapi-platforms/commandapi-bukkit/commandapi-bukkit-test/commandapi-bukkit-test-tests/src/test/java/dev/jorel/commandapi/test/arguments/ArgumentMultiLiteralTests.java
@@ -21,7 +21,7 @@
 /**
  * Tests for the {@link MultiLiteralArgument}
  */
-public class ArgumentMultiLiteralTests extends TestBase {
+class ArgumentMultiLiteralTests extends TestBase {
 
 	/*********
 	 * Setup *