refacture and change to UTF-8