One more refactor.