Fixing sonar reported issues for CC Impl class.