Tidying for release