code cleanup and squashed for music rating defect