Updated Comments as Per Lint recommendations.