Fixed PMD issues.