refactoring: move avustuskohde to own increment