- Yet another refactor.