DDF-333: Updated issues found in code review