fix checkstyle for rest of util with suppressions