Finished separation of location view and model