A little bit of a tidy up