Refactor I18n