More for loops cleanup