[task] fix sonar violations
Merge pull request #89 from davidmoebius/sonar02

Sonar02