Fix sonar Violations