Fix sonar Violation