CHECKSTYLE - fix warnings
Merge pull request #464 from gretchiemoran/master

CLEANUP checkstyle - fix warnings