More i18n refactoring