Match Score -Refactored out duplication with

CurrentMatch entity