and some more clean up