DDF-185 updated with code review comments