More cleaning
Cleaning
Abstracted out score
Moved score to Score module