more code cleanup and consistent rating screen