A little tidy up