major refactoring to remove score precalculator and clean up ScoreHandler