Refactor out feeds from single module