Minor model refactor