Don't use foreach, prefer range-based-for loops

Don't use foreach, prefer range-based-for loops #1514