pmd and findbugs issues fixed