Checkstyle cleanups and other fixes