Round1: Checkstyle cleanup query
Merge pull request #2210 from pveentjer/checkstyles-query

Round1: Checkstyle cleanup query