HHH-8741 - More checkstyle cleanups
HHH-8741 - More checkstyle cleanups