refactored create_matchup method