Refactor, refactor.