Model cleanups

Small improvements