diff --git a/initializr-generator/src/main/java/io/spring/initializr/generator/CommandLineHelpGenerator.java b/initializr-generator/src/main/java/io/spring/initializr/generator/CommandLineHelpGenerator.java
index a99713a0..772bb474 100644
--- a/initializr-generator/src/main/java/io/spring/initializr/generator/CommandLineHelpGenerator.java
+++ b/initializr-generator/src/main/java/io/spring/initializr/generator/CommandLineHelpGenerator.java
@@ -217,7 +217,7 @@ public class CommandLineHelpGenerator {
 		return String.join(",",
 				type.getTags().entrySet().stream()
 						.map(entry -> entry.getKey() + ":" + entry.getValue())
-						.collect(Collectors.toList()).toArray(new String[0]));
+						.toArray(String[]::new));
 	}
 
 	private static class TableGenerator {
diff --git a/initializr-generator/src/main/java/io/spring/initializr/generator/ProjectGenerator.java b/initializr-generator/src/main/java/io/spring/initializr/generator/ProjectGenerator.java
index ce04fd17..2c6d4290 100644
--- a/initializr-generator/src/main/java/io/spring/initializr/generator/ProjectGenerator.java
+++ b/initializr-generator/src/main/java/io/spring/initializr/generator/ProjectGenerator.java
@@ -37,7 +37,6 @@ import io.spring.initializr.metadata.Dependency;
 import io.spring.initializr.metadata.InitializrConfiguration.Env.Maven.ParentPom;
 import io.spring.initializr.metadata.InitializrMetadata;
 import io.spring.initializr.metadata.InitializrMetadataProvider;
-import io.spring.initializr.metadata.MetadataElement;
 import io.spring.initializr.util.TemplateRenderer;
 import io.spring.initializr.util.Version;
 import io.spring.initializr.util.VersionProperty;
diff --git a/initializr-generator/src/main/java/io/spring/initializr/metadata/InitializrConfiguration.java b/initializr-generator/src/main/java/io/spring/initializr/metadata/InitializrConfiguration.java
index 8c201d99..94fcf227 100644
--- a/initializr-generator/src/main/java/io/spring/initializr/metadata/InitializrConfiguration.java
+++ b/initializr-generator/src/main/java/io/spring/initializr/metadata/InitializrConfiguration.java
@@ -130,7 +130,7 @@ public class InitializrConfiguration {
 		return String
 				.join("", Arrays.stream(text
 						.split("(_|-| |:)+")).map(StringUtils::capitalize)
-						.collect(Collectors.toList()).toArray(new String[0]));
+						.toArray(String[]::new));
 	}
 
 	private static String splitCamelCase(String text) {
@@ -138,8 +138,7 @@ public class InitializrConfiguration {
 				.join("", Arrays.stream(text
 						.split("(?<!(^|[A-Z]))(?=[A-Z])|(?<!^)(?=[A-Z][a-z])"))
 						.map(it -> StringUtils.capitalize(it.toLowerCase()))
-						.collect(Collectors.toList())
-						.toArray(new String[0]));
+						.toArray(String[]::new));
 	}
 
 	private static boolean hasInvalidChar(String text) {