More refactoring.
Refactor.
Put my code under Darren.