some checkstyle cleanups