minor changes
fix checkstyle, findbugs, pmd