More refactoring for brandywine. I do think that refactoring counts.