Merge pull request #58 from apache/checkstyle_fixes

Checkstyle fixes