Cleanup

Removing some trailing spaces and adding some utf-8 headers