[fix] fix or some SONAR violations
Merge pull request #34 from davidmoebius/sonarfix02

[fix] fix or some SONAR violations