Address Checkstyle violations

This commit requires temporarily disabling some checks.