Minor checkstyle cleanup in the util package