Rating refactor