Review and cleanup.