- prefer prefix over postfix increment (or use range-based loop)
- pass by const reference
- minor other code cleanups