content delivery refactor