fixed Sonar issues