More code tidy-ups and Maven prep for the next Arqullian upgrade
Merge pull request #24 from karianna/master

More static code and Maven fixes