I18n refactor