Tidying up for release