simplify code, replace iterators with foreach loops
3 files changed