DDF-186 fixed code review comments