Fix checkstyle config, reduce number of checkstyle violations.