Refactor IcalFeed