- Substantial cleanups of the code.