removed more checkstyle messages.