Restructure and format code for the wizards