code cleanup, started new style, added wizard steps