Cleanup

I cleaned up and clarified a few things, so that I don't have any cruft
left over.