changes due to sonar report