Cleanup.
Minor changes.