Rating system refactor