Cleaning Things Up

[billroper]

I continue working on cleaning up the code on this project that I'm working on. Eventually, I'll get it all straightened out. Right now, it's still a bit of a tangle.

And I keep finding interesting branches to go down...