pmd warnings cleared