diff --git a/spring-core/src/main/java/org/springframework/cglib/core/CollectionUtils.java b/spring-core/src/main/java/org/springframework/cglib/core/CollectionUtils.java
index 1590cad077..0e6834382a 100644
--- a/spring-core/src/main/java/org/springframework/cglib/core/CollectionUtils.java
+++ b/spring-core/src/main/java/org/springframework/cglib/core/CollectionUtils.java
@@ -52,12 +52,7 @@ public class CollectionUtils {
     }
 
     public static Collection filter(Collection c, Predicate p) {
-        Iterator it = c.iterator();
-        while (it.hasNext()) {
-            if (!p.evaluate(it.next())) {
-                it.remove();
-            }
-        }
+        c.removeIf(o -> !p.evaluate(o));
         return c;
     }
 
diff --git a/spring-core/src/main/java/org/springframework/cglib/core/internal/CustomizerRegistry.java b/spring-core/src/main/java/org/springframework/cglib/core/internal/CustomizerRegistry.java
index b05afceab1..bba568fff7 100644
--- a/spring-core/src/main/java/org/springframework/cglib/core/internal/CustomizerRegistry.java
+++ b/spring-core/src/main/java/org/springframework/cglib/core/internal/CustomizerRegistry.java
@@ -22,10 +22,7 @@ public class CustomizerRegistry {
         Class<? extends KeyFactoryCustomizer> klass = customizer.getClass();
         for (Class type : customizerTypes) {
             if (type.isAssignableFrom(klass)) {
-                List<KeyFactoryCustomizer> list = customizers.get(type);
-                if (list == null) {
-                    customizers.put(type, list = new ArrayList<>());
-                }
+                List<KeyFactoryCustomizer> list = customizers.computeIfAbsent(type, k -> new ArrayList<>());
                 list.add(customizer);
             }
         }