Checkstyle fixes

Fixes issue #69