comment clean up
more minor clean up