improved i18n
cleaning up unnecessary code