clean up of comments, and warnings