code cleanup
ignoring wrong sonar violations