Some small cleanup.