[fix] fix of some sonar violations
Merge pull request #47 from davidmoebius/sonarfix

[fix] fix of some sonar violations