Tidy up PMD