Comments and minor clean up