A little PMD cleanup