Refactored some of the Matchup struct members to make them more clear at first glance.