DDF-316: Addressed code review comments