checkstyle fixes.
Merge pull request #242 from continuuity/feature/fix-checkstyle

checkstyle fixes.