Merging re-factoring with PMD work