DDF-356 Addressed code review recommendations