Tried to fix the checkstyle issues