Minor refactoring for score keeper