A few minor cosmetic changes