Checkstyle updates and cleanup.