Cleanup
Cleanup
Use range-based for loops