CheckStyle fixes

Fixes #67