DDF-614: Working off next set of code review comments