Refactoring Location export
Refactor location export to avoid duplicate calls