Minor cleanup
Encode to utf-8
Cleanup