Fix some issues

Fix some PMD and checkstyle issues