Fix score field scope
Refactor score class