Tidying up for final submission.