refactoring: mark original location