diff --git a/processor/src/main/java/org/mapstruct/tools/gem/processor/GemProcessor.java b/processor/src/main/java/org/mapstruct/tools/gem/processor/GemProcessor.java
index cc97c09..088aecd 100644
--- a/processor/src/main/java/org/mapstruct/tools/gem/processor/GemProcessor.java
+++ b/processor/src/main/java/org/mapstruct/tools/gem/processor/GemProcessor.java
@@ -11,7 +11,6 @@
 import java.io.Writer;
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -56,11 +55,8 @@ public boolean process(Set<? extends TypeElement> annotationTypes, RoundEnvironm
         try {
             util = new Util( processingEnv.getTypeUtils(), processingEnv.getElementUtils() );
             for ( TypeElement annotationType : annotationTypes ) {
-                Iterator<? extends Element> i = roundEnv.getElementsAnnotatedWith( annotationType ).iterator();
 
-                while ( i.hasNext() ) {
-
-                    Element definingElement = i.next();
+                for ( Element definingElement : roundEnv.getElementsAnnotatedWith( annotationType ) ) {
 
                     // get an annotation mirror on @GemDefinitions
                     AnnotationMirror gemDefinitionsMirror = definingElement
@@ -76,7 +72,7 @@ public boolean process(Set<? extends TypeElement> annotationTypes, RoundEnvironm
                         "value",
                         List.class
                     );
-                    gemDefinitionMirrors.stream().forEach( m -> addGemInfo( m, definingElement ) );
+                    gemDefinitionMirrors.forEach( m -> addGemInfo( m, definingElement ) );
                 }
             }
             postProcessGemInfo();