Some minor cleanups based on Checkstyle/Findbugs/PMD
Merge pull request #4 from rorygraves/master

Some minor cleanups based on Checkstyle/Findbugs/PMD