Rename + remove evil "each" in for loops