Just some refactoring and proper UTF-8 encoding. :)