Fixing PMD violations