[task] fixed sonar bugs
Merge pull request #98 from davidmoebius/sonar

[task] fixed sonar bugs