Cleaning things up ready for submision