clean code + i18n wip