Little bit of a tidy up