location refactorings