cleaning up a bit the i18n

and removing mustache for this purpose