i18n (#51) + functions clean up