Refactored some code, feeds are retrieved properly