poartial fix for #46 - Sonarqube found problems in Checkstyle
Merge pull request #72 from isopov/sonar-fixes

Fixes for Sonar-found problems in checkstye codebase