Messages refactorized to fit i18n