simplify some loops
5 files changed