Fixes for checkstyle.
Merge pull request #15 from cgruber/minorfixes

Fixes for checkstyle.