Adding up scores in a cleaner way.
Deleted code related to context.
Changed tests.