Improve output score + code cleaning
Merge pull request #2 from ncolomer/master

Improve output score + code cleaning