DDF-604: updates based on code review