refactor advertiser, browser