More Checkstyle fixes
Merge pull request #332 from f2prateek/checks

More Checkstyle fixes