Corrected PMD errors
Merge pull request #365 from kazoompa/pmd-corrections

Corrected PMD errors