Refactory of messages i18