#36 Refactored feed refresh