Clean up code in app_feeds module