little bit of a clean up