OPAL-2077: Fixing PMD warnings
Merge pull request #58 from emorency/OPAL-2077

OPAL-2077: Fixing PMD warnings