Finish refactor.