misc checkstyle fixes
Merge pull request #163 from brharrington/master

cleanup checkstyle warnings