Refactor controller ads