[name] Use iterators more
2 files changed