Refactorings in wizard components