refactor, tests, ScoresSingleton