Refactor , i18n and help