Moved RatingClass to parent objects, code cleanup