fixing Sonar Code Style checks