Tidy up for the public