diff --git a/scm-core/src/main/java/sonia/scm/search/SearchUtil.java b/scm-core/src/main/java/sonia/scm/search/SearchUtil.java
index 90c65e3456..dc18e6bd27 100644
--- a/scm-core/src/main/java/sonia/scm/search/SearchUtil.java
+++ b/scm-core/src/main/java/sonia/scm/search/SearchUtil.java
@@ -37,18 +37,16 @@ package sonia.scm.search;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
 import sonia.scm.TransformFilter;
 import sonia.scm.util.Util;
 
-//~--- JDK imports ------------------------------------------------------------
-
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 
+//~--- JDK imports ------------------------------------------------------------
+
 /**
  *
  * @author Sebastian Sdorra
@@ -165,23 +163,18 @@ public final class SearchUtil
     List<T> items = new ArrayList<T>();
     int index = 0;
     int counter = 0;
-    Iterator<T> it = collection.iterator();
 
-    while (it.hasNext())
-    {
-      T item = filter.accept(it.next());
+    for (final T aCollection : collection) {
+      T item = filter.accept(aCollection);
 
-      if (item != null)
-      {
+      if (item != null) {
         index++;
 
-        if (searchRequest.getStartWith() <= index)
-        {
+        if (searchRequest.getStartWith() <= index) {
           items.add(item);
           counter++;
 
-          if (searchRequest.getMaxResults() <= counter)
-          {
+          if (searchRequest.getMaxResults() <= counter) {
             break;
           }
         }
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitLogCommand.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitLogCommand.java
index 0643035e7a..2c6fac254b 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitLogCommand.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitLogCommand.java
@@ -235,22 +235,15 @@ public class GitLogCommand extends AbstractGitCommand implements LogCommand
             revWalk.markStart(revWalk.lookupCommit(head));
           }
 
-          Iterator<RevCommit> iterator = revWalk.iterator();
-
-          while (iterator.hasNext())
-          {
-            RevCommit commit = iterator.next();
-
+          for (final RevCommit commit : revWalk) {
             if ((counter >= start)
-              && ((limit < 0) || (counter < start + limit)))
-            {
+              && ((limit < 0) || (counter < start + limit))) {
               changesetList.add(converter.createChangeset(commit));
             }
 
             counter++;
 
-            if ((endId != null) && commit.getId().equals(endId))
-            {
+            if ((endId != null) && commit.getId().equals(endId)) {
               break;
             }
           }