Make minor cosmetic improvements