Fixup checkstyle and warnings.
Merge pull request #1 from bkemper-pentaho/master

Fixup checkstyle and warnings.