Some minor cosmetic changes