fixing sonar violations again