Fixed some PMD warnings
Merge pull request #366 from emorency/master

Fixed some PMD warnings