Minor refactoring for score keeper
Merge pull request #4 from mastahu/master

Minor refactoring for score keeper