cleanup of comments