- replaced for_each with range-based for loop
- added missing std:: scope
- for-loop temp now declared outside the loop to be in scope
- removed casts in calls to trim()