some clean up of comments