Refactored some methods
Merge pull request #60 from pborreli/refacto-score

Refactored some methods