Basic Clean up of iteration 1 for dynamic ratings
Basic Clean up2 of iteration 1 for dynamic ratings