changes due to sonar report

sonar derived changes