Refactor: Pull argument setup into initialize