Refactored score into new singleton class