Small wizard refactoring