minor cosmetical cleanups