More checkstyle cleanups