Prefer prefix increment on loop iterators.
Began work on refactoring for 2d array