minor cosmetic improvements