renamed + removed evil "each" in for loops