A lot of refactor.