minor cosmetical cleanups...