Comment and cleanup.