fixed some Sonar critical issues