Cleaned some code (loops)
Cleaned some more..