fixed some SONAR issues