Fixing charset lines to use double quotes, stripped a few comments for consistency