Minor model refactor

No match.