Cleaned up model_view a bit