pmd and findbugs fixed