Refactored i18n messages