DDF-463 Updated code to match checkstyle rules.