Default encoding set to UTF-8; minor cosmetic changes for improved readibility in a few files