checkstyle cleanups