fix CS
fix PMD
fix false positive on PMD