fixed sonar code quality