Major cleanup.
Atonement for my sins against serious business.