nicer grouping for matches