clenup of comments.