Refactor out score model