Refactor.
Modified.