Cleanup. Mostly minor changes.