Nice refactor.