fixed sonar-issues