Minimal wizard refactoring