some cleaning up of the comments