Improved: some PMD findings