Refactor create match

trying to simplify the code for creating a match with multiple sets