[fix] fixed SONAR violations
Merge pull request #83 from davidmoebius/sonarfix02

[fix] fixed SONAR violations