[TASK] Some refactorings to make Rating actually working