More experimenting.
Minor cleanup