Scores are only calculated once now

Refactored the way scores are calculated to make it more efficient and
only happen in one place.