Refactoring WizardController