a bit of tidy up