Refactor scoring