some more clean up