bit of tidy up