more cleanup
moar tidyoop
cleanup for the cleanup