refactored some intl