DDF-660: Addressed code review issues