I18n refactoring to i18n