Refactoring some of the i18n