Update MatchScoreViewModel.cs

Code clean up and refactoring