A bit of refactor.