'Locate' section refactoring