minor model cleanup