Update Services.cs

Refactored to remove overlapping Match class