Refactor: pull argument set-up into intialize