refactor; add option to strip diacritics