more checkstyle fixes