Updated classes and setting score
Remove unnecessary variable
Merge pull request #69 from adaptlearning/issue/#67

Updated classes and setting score