sonar violations fix
Merge pull request #47 from artkoshelev/master

sonar violations fix