[cleanup] fixed Sonar violations
Merge pull request #40 from tkrille/OSNG-196

[cleanup] fixed Sonar violations