code refactoring - Wizard flow.