reduced Sonar Issues,reduced Complexity