refactoring locations