Re-refactor.