Fix checkstyle violations
Merge pull request #359 from pavel-sakun/fix-checktyle-violations

Fix checkstyle violations