Changed some post-increments to pre-increments.