Refactor locations