fixing pmd issues