DDF-185 added codice headers per code review comments