Tidy up date aggregation