fixed some sonar-warnings