refactored locations