diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/EmptyCatchBlockCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/EmptyCatchBlockCheck.java
index 915c51032..f7f3a92d2 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/EmptyCatchBlockCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/EmptyCatchBlockCheck.java
@@ -227,9 +227,9 @@ public class EmptyCatchBlockCheck extends Check {
         else if (firstElementInBlock.getType() == TokenTypes.BLOCK_COMMENT_BEGIN) {
             commentContent = firstElementInBlock.getFirstChild().getText();
             final String[] lines = commentContent.split(System.getProperty("line.separator"));
-            for (int i = 0; i < lines.length; i++) {
-                if (!lines[i].isEmpty()) {
-                    commentContent = lines[i];
+            for (String line : lines) {
+                if (!line.isEmpty()) {
+                    commentContent = line;
                     break;
                 }
             }
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/InnerAssignmentCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/InnerAssignmentCheck.java
index 8ac590402..873cb6ca0 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/InnerAssignmentCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/InnerAssignmentCheck.java
@@ -240,10 +240,9 @@ public class InnerAssignmentCheck
         boolean found = false;
         for (int[] element : contextSet) {
             DetailAST current = ast;
-            final int len = element.length;
-            for (int j = 0; j < len; j++) {
+            for (int anElement : element) {
                 current = current.getParent();
-                final int expectedType = element[j];
+                final int expectedType = anElement;
                 if (current.getType() != expectedType) {
                     found = false;
                     break;
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/AtclauseOrderCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/AtclauseOrderCheck.java
index bacebe9af..06334b6fc 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/AtclauseOrderCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/AtclauseOrderCheck.java
@@ -105,8 +105,8 @@ public class AtclauseOrderCheck extends AbstractJavadocCheck {
     public void setTarget(String target) {
         final List<Integer> customTarget = new ArrayList<>();
         final String[] sTarget = target.split(",");
-        for (int i = 0; i < sTarget.length; i++) {
-            customTarget.add(Utils.getTokenId(sTarget[i].trim()));
+        for (String aSTarget : sTarget) {
+            customTarget.add(Utils.getTokenId(aSTarget.trim()));
         }
         this.target = customTarget;
     }
@@ -118,8 +118,8 @@ public class AtclauseOrderCheck extends AbstractJavadocCheck {
     public void setTagOrder(String order) {
         final List<String> customOrder = new ArrayList<>();
         final String[] sOrder = order.split(",");
-        for (int i = 0; i < sOrder.length; i++) {
-            customOrder.add(sOrder[i].trim());
+        for (String aSOrder : sOrder) {
+            customOrder.add(aSOrder.trim());
         }
         this.tagOrder = customOrder;
     }
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/SingleLineJavadocCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/SingleLineJavadocCheck.java
index 2e0eab02b..b6e19f358 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/SingleLineJavadocCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/SingleLineJavadocCheck.java
@@ -80,8 +80,8 @@ public class SingleLineJavadocCheck extends AbstractJavadocCheck {
     public void setIgnoredTags(String tags) {
         final List<String> ignoredTags = new ArrayList<>();
         final String[] sTags = tags.split(",");
-        for (int i = 0; i < sTags.length; i++) {
-            ignoredTags.add(sTags[i].trim());
+        for (String sTag : sTags) {
+            ignoredTags.add(sTag.trim());
         }
         this.ignoredTags = ignoredTags;
     }
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyCommentFilter.java b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyCommentFilter.java
index 0b43ccb61..19ce3e81f 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyCommentFilter.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyCommentFilter.java
@@ -22,7 +22,6 @@ package com.puppycrawl.tools.checkstyle.filters;
 import java.lang.ref.WeakReference;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Objects;
 import java.util.regex.Matcher;
@@ -399,8 +398,7 @@ public class SuppressWithNearbyCommentFilter
             setFileContents(currentContents);
             tagSuppressions();
         }
-        for (final Iterator<Tag> iter = tags.iterator(); iter.hasNext();) {
-            final Tag tag = iter.next();
+        for (final Tag tag : tags) {
             if (tag.isMatch(event)) {
                 return false;
             }