Tidy up pt.2