Merge pull request #58 from emorency/OPAL-2077

OPAL-2077: Fixing PMD warnings
OPAL-2084: Filtering null before transforming list of variables