Completed the refactor.