comments, and cleanup.