refactor the adverts part 1