rewrite comment, cleanup.