Scattered Refactorings

I'm doing these while I learn the codebase.
Ditto