cleanup of comments and some code.