Move wizard steps to helper