diff --git a/src/main/java/net/sf/jsqlparser/statement/select/PlainSelect.java b/src/main/java/net/sf/jsqlparser/statement/select/PlainSelect.java
index 882b320be..4d13ef709 100644
--- a/src/main/java/net/sf/jsqlparser/statement/select/PlainSelect.java
+++ b/src/main/java/net/sf/jsqlparser/statement/select/PlainSelect.java
@@ -27,8 +27,6 @@
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.schema.Table;
 
-/**
- */
 /**
  * The core of a "SELECT" statement (no UNION, no ORDER BY)
  */
@@ -163,9 +161,7 @@ public void setGroupByColumnReferences(List<Expression> list) {
 
 	@Override
 	public String toString() {
-		String sql = "";
-
-		sql = "SELECT ";
+		String sql = "SELECT ";
 		sql += ((distinct != null) ? "" + distinct + " " : "");
 		sql += ((top != null) ? "" + top + " " : "");
 		sql += getStringList(selectItems);
diff --git a/src/main/java/net/sf/jsqlparser/util/TablesNamesFinder.java b/src/main/java/net/sf/jsqlparser/util/TablesNamesFinder.java
index ba65539fe..c047dc549 100644
--- a/src/main/java/net/sf/jsqlparser/util/TablesNamesFinder.java
+++ b/src/main/java/net/sf/jsqlparser/util/TablesNamesFinder.java
@@ -93,8 +93,7 @@ public void visit(PlainSelect plainSelect) {
 		plainSelect.getFromItem().accept(this);
 
 		if (plainSelect.getJoins() != null) {
-			for (Iterator joinsIt = plainSelect.getJoins().iterator(); joinsIt.hasNext();) {
-				Join join = (Join) joinsIt.next();
+			for (Join join : plainSelect.getJoins()) {
 				join.getRightItem().accept(this);
 			}
 		}
@@ -249,8 +248,7 @@ public void visitBinaryExpression(BinaryExpression binaryExpression) {
 
 	@Override
 	public void visit(ExpressionList expressionList) {
-		for (Iterator iter = expressionList.getExpressions().iterator(); iter.hasNext();) {
-			Expression expression = (Expression) iter.next();
+		for (Expression expression : expressionList.getExpressions()) {
 			expression.accept(this);
 		}
 
@@ -345,8 +343,7 @@ public void visit(AnalyticExpression analytic) {
 
 	@Override
 	public void visit(SetOperationList list) {
-		for (Iterator iter = list.getPlainSelects().iterator(); iter.hasNext();) {
-			PlainSelect plainSelect = (PlainSelect) iter.next();
+		for (PlainSelect plainSelect : list.getPlainSelects()) {
 			visit(plainSelect);
 		}
 	}