More tidying for release