[#703 Wizard] Code cleanups