Tidying up ready for release