Refactor score