Checkstyle and Metrics fixes
Merge pull request #1 from vassalty/master

Checkstyle and Metrics fixes