Checkstyle Cleanups.