diff --git a/initializr-actuator/src/main/java/io/spring/initializr/actuate/metric/ProjectGenerationMetricsListener.java b/initializr-actuator/src/main/java/io/spring/initializr/actuate/metric/ProjectGenerationMetricsListener.java
index 2cd85974..3b762a20 100644
--- a/initializr-actuator/src/main/java/io/spring/initializr/actuate/metric/ProjectGenerationMetricsListener.java
+++ b/initializr-actuator/src/main/java/io/spring/initializr/actuate/metric/ProjectGenerationMetricsListener.java
@@ -24,7 +24,6 @@ import io.spring.initializr.generator.ProjectRequest;
 import io.spring.initializr.metadata.Dependency;
 import io.spring.initializr.util.Agent;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.actuate.metrics.CounterService;
 import org.springframework.context.event.EventListener;
 import org.springframework.util.StringUtils;
@@ -39,7 +38,6 @@ public class ProjectGenerationMetricsListener {
 
 	private final CounterService counterService;
 
-	@Autowired
 	public ProjectGenerationMetricsListener(CounterService counterService) {
 		this.counterService = counterService;
 	}
diff --git a/initializr-generator/src/main/java/io/spring/initializr/metadata/InitializrMetadata.java b/initializr-generator/src/main/java/io/spring/initializr/metadata/InitializrMetadata.java
index 814c5448..fa4e7f9c 100644
--- a/initializr-generator/src/main/java/io/spring/initializr/metadata/InitializrMetadata.java
+++ b/initializr-generator/src/main/java/io/spring/initializr/metadata/InitializrMetadata.java
@@ -167,7 +167,7 @@ public class InitializrMetadata {
 					&& !repositories.containsKey(dependency.getRepository())) {
 				throw new InvalidInitializrMetadataException("Dependency " + dependency
 						+ "defines an invalid repository id " + dependency.getRepository()
-						+ ", available repositores " + repositories);
+						+ ", available repositories " + repositories);
 			}
 		}
 		for (BillOfMaterials bom : boms.values()) {
@@ -190,7 +190,7 @@ public class InitializrMetadata {
 					if (!repositories.containsKey(r)) {
 						throw new InvalidInitializrMetadataException(
 								m + " of " + bom + "defines an invalid repository id " + r
-										+ ", available repositores " + repositories);
+										+ ", available repositories " + repositories);
 					}
 
 				}
diff --git a/initializr-generator/src/test/java/io/spring/initializr/util/VersionPropertyTests.java b/initializr-generator/src/test/java/io/spring/initializr/util/VersionPropertyTests.java
index 2d88d1a0..646f58da 100644
--- a/initializr-generator/src/test/java/io/spring/initializr/util/VersionPropertyTests.java
+++ b/initializr-generator/src/test/java/io/spring/initializr/util/VersionPropertyTests.java
@@ -30,7 +30,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 public class VersionPropertyTests {
 
 	@Rule
-	public ExpectedException thrown = ExpectedException.none();
+	public final ExpectedException thrown = ExpectedException.none();
 
 	@Test
 	public void testStandardProperty() {
diff --git a/initializr-web/src/test/java/io/spring/initializr/web/test/JsonFieldProcessor.java b/initializr-web/src/test/java/io/spring/initializr/web/test/JsonFieldProcessor.java
index 9ef568db..062bc754 100644
--- a/initializr-web/src/test/java/io/spring/initializr/web/test/JsonFieldProcessor.java
+++ b/initializr-web/src/test/java/io/spring/initializr/web/test/JsonFieldProcessor.java
@@ -33,27 +33,13 @@ final class JsonFieldProcessor {
 
 	boolean hasField(JsonFieldPath fieldPath, Object payload) {
 		final AtomicReference<Boolean> hasField = new AtomicReference<>(false);
-		traverse(new ProcessingContext(payload, fieldPath), new MatchCallback() {
-
-			@Override
-			public void foundMatch(Match match) {
-				hasField.set(true);
-			}
-
-		});
+		traverse(new ProcessingContext(payload, fieldPath), match -> hasField.set(true));
 		return hasField.get();
 	}
 
 	Object extract(JsonFieldPath path, Object payload) {
 		final List<Object> matches = new ArrayList<>();
-		traverse(new ProcessingContext(payload, path), new MatchCallback() {
-
-			@Override
-			public void foundMatch(Match match) {
-				matches.add(match.getValue());
-			}
-
-		});
+		traverse(new ProcessingContext(payload, path), match -> matches.add(match.getValue()));
 		if (matches.isEmpty()) {
 			throw new IllegalArgumentException("Field does not exist: " + path);
 		}
@@ -66,14 +52,7 @@ final class JsonFieldProcessor {
 	}
 
 	void remove(final JsonFieldPath path, Object payload) {
-		traverse(new ProcessingContext(payload, path), new MatchCallback() {
-
-			@Override
-			public void foundMatch(Match match) {
-				match.remove();
-			}
-
-		});
+		traverse(new ProcessingContext(payload, path), Match::remove);
 	}
 
 	private void traverse(ProcessingContext context, MatchCallback matchCallback) {