Better design = more testability (MatchService introduced)