Fix: Refactor.