code cleanup - everything except background image for rating works