Checkstyle fixes ...
Merge pull request #335 from gretchiemoran/master

Checkstyle fixes ...