Tidying features for release