refactoring: Location