Issue #96 Fixed PMD errors