general refactor/sponsor