Refactor of my refactor.