Small refactor + add i18n directive