checkstlye fixes
Merge pull request #291 from dmuino/checkstyle

checkstlye fixes