Refactor globalization