refactored Match to avoid team_1 and team_2 duplication