[task] fixed sonar violations
Merge pull request #25 from davidmoebius/sonar_violations

Sonar violations