diff --git a/src/main/java/com/avaje/ebeaninternal/server/autofetch/DefaultAutoFetchManager.java b/src/main/java/com/avaje/ebeaninternal/server/autofetch/DefaultAutoFetchManager.java
index fcf738a64..4d0b8e22b 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/autofetch/DefaultAutoFetchManager.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/autofetch/DefaultAutoFetchManager.java
@@ -329,17 +329,15 @@ public class DefaultAutoFetchManager implements AutoFetchManager, Serializable {
 		synchronized (statisticsMonitor) {
 
 		    Counters counters = new Counters();
-		    
-			Iterator<Statistics> it = statisticsMap.values().iterator();
-			while (it.hasNext()) {
-				Statistics queryPointStatistics = it.next();
-				if (!queryPointStatistics.hasUsage()){
-				    // no usage statistics collected yet...
-				    counters.incrementNoUsage();
-				} else {
-				    updateTunedQueryFromUsage(counters, queryPointStatistics);
-				}
-			}
+
+      for (Statistics queryPointStatistics : statisticsMap.values()) {
+        if (!queryPointStatistics.hasUsage()) {
+          // no usage statistics collected yet...
+          counters.incrementNoUsage();
+        } else {
+          updateTunedQueryFromUsage(counters, queryPointStatistics);
+        }
+      }
 
 			String summaryInfo = counters.toString();
 
diff --git a/src/main/java/com/avaje/ebeaninternal/server/autofetch/Statistics.java b/src/main/java/com/avaje/ebeaninternal/server/autofetch/Statistics.java
index c4ee931e2..491e5fed5 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/autofetch/Statistics.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/autofetch/Statistics.java
@@ -76,12 +76,10 @@ public class Statistics implements Serializable {
 			}
 		    
 			PathProperties pathProps = new PathProperties();
-			
-			Iterator<StatisticsNodeUsage> it = nodeUsageMap.values().iterator();
-			while (it.hasNext()) {
-				StatisticsNodeUsage statsNode = it.next();
-				statsNode.buildTunedFetch(pathProps, rootDesc);
-			}
+
+      for (StatisticsNodeUsage statsNode : nodeUsageMap.values()) {
+        statsNode.buildTunedFetch(pathProps, rootDesc);
+      }
 
 	        OrmQueryDetail detail = new OrmQueryDetail();
 
diff --git a/src/main/java/com/avaje/ebeaninternal/server/cluster/mcast/McastClusterManager.java b/src/main/java/com/avaje/ebeaninternal/server/cluster/mcast/McastClusterManager.java
index 9503b4472..fd32689c2 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/cluster/mcast/McastClusterManager.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/cluster/mcast/McastClusterManager.java
@@ -376,13 +376,11 @@ public class McastClusterManager implements ClusterBroadcast, Runnable {
 
       totalPacketsResent += s.size();
 
-      Iterator<Long> it = s.iterator();
-      while (it.hasNext()) {
-        Long resendPacketId = it.next();
+      for (Long resendPacketId : s) {
         Packet packet = outgoingPacketsCache.getPacket(resendPacketId);
         if (packet == null) {
           String msg = "Cluster unable to resend packet[" + resendPacketId + "] as it is no longer in the " +
-                  "outgoingPacketsCache";
+              "outgoingPacketsCache";
           logger.error(msg);
         } else {
           int resendCount = packet.incrementResendCount();
@@ -390,7 +388,7 @@ public class McastClusterManager implements ClusterBroadcast, Runnable {
             resendPacket(packet);
           } else {
             String msg = "Cluster maxResendOutgoing [" + maxResendOutgoing + "] hit for packet " + resendPacketId
-                    + ". We will not try to send it anymore, removing it from the outgoingPacketsCache.";
+                + ". We will not try to send it anymore, removing it from the outgoingPacketsCache.";
             logger.error(msg);
             outgoingPacketsCache.remove(packet);
           }