More refactoring of the God class.