Whitespace cleanup and change to utf-8