minor cosmetic code improvements