Refactoring locations