Refactor/rating