Refactor score methods and delegate