Some code clean up in faalis engine and i18n