diff --git a/src/main/java/org/springframework/classify/PatternMatcher.java b/src/main/java/org/springframework/classify/PatternMatcher.java
index 0efe91f0..da73093f 100644
--- a/src/main/java/org/springframework/classify/PatternMatcher.java
+++ b/src/main/java/org/springframework/classify/PatternMatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
 package org.springframework.classify;
 
 import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
diff --git a/src/main/java/org/springframework/classify/util/MethodInvokerUtils.java b/src/main/java/org/springframework/classify/util/MethodInvokerUtils.java
index 2818796a..a13be209 100644
--- a/src/main/java/org/springframework/classify/util/MethodInvokerUtils.java
+++ b/src/main/java/org/springframework/classify/util/MethodInvokerUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -54,7 +54,7 @@ public static MethodInvoker getMethodInvokerByName(Object object, String methodN
 		Method method = ClassUtils.getMethodIfAvailable(object.getClass(), methodName, paramTypes);
 		if (method == null) {
 			String errorMsg = "no method found with name [" + methodName + "] on class ["
-					+ object.getClass().getSimpleName() + "] compatable with the signature ["
+					+ object.getClass().getSimpleName() + "] compatible with the signature ["
 					+ getParamTypesString(paramTypes) + "].";
 			Assert.isTrue(!paramsRequired, errorMsg);
 			// if no method was found for the given parameters, and the
@@ -121,7 +121,7 @@ public static MethodInvoker getMethodInvokerByAnnotation(final Class<? extends A
 					Class<?>[] paramTypes = method.getParameterTypes();
 					if (paramTypes.length > 0) {
 						String errorMsg = "The method [" + method.getName() + "] on target class ["
-								+ targetClass.getSimpleName() + "] is incompatable with the signature ["
+								+ targetClass.getSimpleName() + "] is compatible with the signature ["
 								+ getParamTypesString(expectedParamTypes) + "] expected for the annotation ["
 								+ annotationType.getSimpleName() + "].";
 
diff --git a/src/main/java/org/springframework/retry/backoff/BackOffInterruptedException.java b/src/main/java/org/springframework/retry/backoff/BackOffInterruptedException.java
index fcd38b17..4ecb5661 100644
--- a/src/main/java/org/springframework/retry/backoff/BackOffInterruptedException.java
+++ b/src/main/java/org/springframework/retry/backoff/BackOffInterruptedException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2007 the original author or authors.
+ * Copyright 2006-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
 import org.springframework.retry.RetryException;
 
 /**
- * Exception class signifiying that an attempt to back off using a {@link BackOffPolicy}
+ * Exception class signifying that an attempt to back off using a {@link BackOffPolicy}
  * was interrupted, most likely by an {@link InterruptedException} during a call to
  * {@link Thread#sleep(long)}.
  *
diff --git a/src/main/java/org/springframework/retry/interceptor/StatefulRetryOperationsInterceptor.java b/src/main/java/org/springframework/retry/interceptor/StatefulRetryOperationsInterceptor.java
index 6844eda7..c348d48f 100644
--- a/src/main/java/org/springframework/retry/interceptor/StatefulRetryOperationsInterceptor.java
+++ b/src/main/java/org/springframework/retry/interceptor/StatefulRetryOperationsInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,7 +25,6 @@
 
 import org.springframework.classify.Classifier;
 import org.springframework.retry.RecoveryCallback;
-import org.springframework.retry.RetryCallback;
 import org.springframework.retry.RetryContext;
 import org.springframework.retry.RetryOperations;
 import org.springframework.retry.RetryState;
diff --git a/src/main/java/org/springframework/retry/support/Args.java b/src/main/java/org/springframework/retry/support/Args.java
index af3e6509..779e3206 100644
--- a/src/main/java/org/springframework/retry/support/Args.java
+++ b/src/main/java/org/springframework/retry/support/Args.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 the original author or authors.
+ * Copyright 2022-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@
  * {@code maxAttempts = 0}.
  *
  * @author Gary Russell
- * @Since 2.0
+ * @since 2.0
  */
 public class Args {
 
diff --git a/src/test/java/org/springframework/retry/backoff/DummySleeper.java b/src/test/java/org/springframework/retry/backoff/DummySleeper.java
index a9850f96..d839edc8 100644
--- a/src/test/java/org/springframework/retry/backoff/DummySleeper.java
+++ b/src/test/java/org/springframework/retry/backoff/DummySleeper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@
 package org.springframework.retry.backoff;
 
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 
 /**