new-data-format - code review corrections