some PMD improvements