Refactor the way ICS feeds are built