some more clean up
some more clean up