A bit of a tidy up