cleanup violations found by sonar
Merge pull request #12 from vasilievip/master

Additional fixes for violations found by code analysis