a bit of a clean up