bit of cleaning up