Fix checkstyle errors
Merge pull request #119 from square/jwilson/style

Fix checkstyle errors