more checkstyle fixes.