code clean up in wizard.