Just some more clean up