DDF-842: Update code per code review comments