More PMD work
26 files changed