[DDF-395] Initial checkstyle fixes.

There are a couple of other issues, but I'd like to resolve #394 before getting into that.
[DDF-395] More checkstyle fixes.
Merge pull request #1 from bradh/checkstyle

Checkstyle fixes - reviewed by @mrmateo