Rating fixed :) Average rating is computed correctly and Top Rated works + some refactoring