cleaned up wizard