Minor refactor of incrementor