Enhanced formatting, perhaps improved performance

I made some changes that may or may not have improved performance.  I'm
too lazy to test it.
Also, I improved formatting in a way that ~~probably makes it worse~~ I
like.
Also, I renamed things.
Also, there are still no comments.
Also, there is still only one person to date who this has benefited from
this project.  9 months ago.