Refactor scoring project