PMD recommended changes