Refactor user scores