Cleanup
For loop bug fix: applied to all data