checkstyle fixes
checkstyle fixes, round 2
Merge pull request #215 from hgschmie/checkstyle

checkstyle fixes