Refactor Group#match