Cleanup.
Minor changes.
Minor updates and improvements.