Fixing Checkstyle issues