minor refactoring. more to be done
Merge branch 'master' into statistics
Merge pull request #20 from nairys/statistics

scoring and guessing refactoring