DDF-98: incorporated code review comments