Checkstyle fixes

Partial of work on DDF-395