fixed lint and checkstyle issues