Refactor wizzard