fixing of sonar violations
fixing sonar violations