Rename data-version to data-format-version

- data-version would refer to data versioning, which we might introduce, rather than data format versioning
Minor: rename
Indent and use eq/ne
Indent and import
Remove incorrect reference to model

- the model is not in the current scope anyway!