pmd: general cleanup.