Refactoring some of the i18n
i18n improvements