Cleanups to make the code easier to read and more maintainable.
These are remnants of the previous series.