refactored Tour and Location models