More view/model cleanup