Tidy up pt.1