Attempting to refactor.