
            More refactoring.

a525f8d