Fixed ratings, cleanup