Clear scores on deal and some refactoring