Tidy up AdvertisementImpl