refactor all tours partial