pre-increment over post
Minor tweaks