Refactor wizard confirmation