sonar violation fixes