I do agree, and I started changing some of it, but then I realized this PR was already going to be big enough without that stuff, and put it back >.>