findbugs and pmd cleanup