Tidying up coverage grouping