misc checkstyle fixes
Merge pull request #187 from brharrington/checkstyle-fixes

misc checkstyle fixes