more code cleanup
wizard in prep for data visualizations