Refactored the advertisments