can you please inline `model-class` and `type_name`. Extracting the variable adds more complexity but doesn't buy us much.