Finish the refactor.