More refactoring.
More refactoring.
Even more refactoring.
Continuing to clean up this class.