Clean up and encoding: utf-8 all over the place