Cleaned up some code based on PMD output
Merge pull request #5 from jackmacattack/static-analysis

Cleaned up some code based on PMD output