Refactor. Save with UTF-8 encoding