I18N refactor