Cosmetics
Better handling of encodings