Finish first refactor.