Fixing checkstyle issues