Refactor: Transform `while` loop into `for`

And reduce scope for some variables + use some more `auto`.
1 file changed