JPM/HM: Refactored scoreScollector after concurrency issue.