Minor code clean up, make all content served as utf-8