Last minute tidy up