Cleaned up for loops