added score tracker +  minor refactor