Improved some more for loops