keeping things tight in Models