Replace iterators with foreach loops
Fix invalid javadoc param