Fixed pmd issues.