Trying to refactor.