Tidy up for submission

Submit