Fixed PMD errors