Tried again to fix checkstyle issues