Refactoring: greatly cleaned up "MatchMaker"