Fixed PMD issues (#12)