Address Checkstyle violations

This commit requires temporarily disabling some checks.
Merge pull request #1544 from maginatics/checkstyle

Address Checkstyle violations