DDF-347: code review comments fixed