Clean up and fix feeder: Singleton is by Feed, not by (Feed, number)