DDF-62 Addressed code review comments