diff --git a/src/data/sources/538.js b/src/data/sources/538.js
index 4b960a0..a721d19 100644
--- a/src/data/sources/538.js
+++ b/src/data/sources/538.js
@@ -1,10 +1,6 @@
 const Feed = require('./feed');
 const types = require('../types');
 
-class FiveThirtyEight extends Feed {
-  constructor() {
-    super('https://fivethirtyeight.com/features/feed/', types.FiveThirtyEight);
-  }
-}
+const FiveThirtyEight = new Feed('https://fivethirtyeight.com/features/feed/', types.FiveThirtyEight);
 
-module.exports = new FiveThirtyEight();
+module.exports = FiveThirtyEight;
diff --git a/src/data/sources/av-club.js b/src/data/sources/av-club.js
index a19d493..2af122b 100644
--- a/src/data/sources/av-club.js
+++ b/src/data/sources/av-club.js
@@ -1,10 +1,6 @@
 const Feed = require('./feed');
 const types = require('../types');
 
-class AVClub extends Feed {
-  constructor() {
-    super('http://www.avclub.com/feeds/rss/', types.AVClub);
-  }
-}
+const AVClub = new Feed('http://www.avclub.com/feeds/rss/', types.AVClub)
 
 module.exports = new AVClub();
diff --git a/src/data/sources/beta-list.js b/src/data/sources/beta-list.js
index 5baf2ee..48288aa 100644
--- a/src/data/sources/beta-list.js
+++ b/src/data/sources/beta-list.js
@@ -1,10 +1,6 @@
 const Feed = require('./feed');
 const types = require('../types');
 
-class BetaList extends Feed {
-  constructor() {
-    super('http://feeds.feedburner.com/BetaList', types.BetaList);
-  }
-}
+const BetaList = new Feed('http://feeds.feedburner.com/BetaList', types.BetaList);
 
-module.exports = new BetaList();
+module.exports = BetaList;
diff --git a/src/data/sources/designer-news.js b/src/data/sources/designer-news.js
index 7fb5e27..617926f 100644
--- a/src/data/sources/designer-news.js
+++ b/src/data/sources/designer-news.js
@@ -1,10 +1,6 @@
 const Feed = require('./feed');
 const types = require('../types');
 
-class DesignerNews extends Feed {
-  constructor() {
-    super('https://www.designernews.co/?format=rss', types.DesignerNews);
-  }
-}
+const DesignerNews = new Feed('https://www.designernews.co/?format=rss', types.DesignerNews);
 
-module.exports = new DesignerNews();
+module.exports = DesignerNews;
diff --git a/src/data/sources/hacker-noon.js b/src/data/sources/hacker-noon.js
index 95d38b8..278d026 100644
--- a/src/data/sources/hacker-noon.js
+++ b/src/data/sources/hacker-noon.js
@@ -1,10 +1,6 @@
 const Feed = require('./feed');
 const types = require('../types');
 
-class HackerNoon extends Feed {
-  constructor() {
-    super('https://hackernoon.com/feed', types.HackerNoon);
-  }
-}
+const HackerNoon = new Feed('https://hackernoon.com/feed', types.HackerNoon);
 
-module.exports = new HackerNoon();
+module.exports = HackerNoon;
diff --git a/src/data/sources/indie-hackers.js b/src/data/sources/indie-hackers.js
index 25c01c2..fbf1ee7 100644
--- a/src/data/sources/indie-hackers.js
+++ b/src/data/sources/indie-hackers.js
@@ -1,14 +1,6 @@
 const Feed = require('./feed');
 const types = require('../types');
 
-// All their articles are published at the same time so they'd apprear
-// grouped together
-// Probably shouldn't use this
+const IndieHackers = new Feed('https://www.indiehackers.com/feed.xml', types.IndieHackers);
 
-class IndieHackers extends Feed {
-  constructor() {
-    super('https://www.indiehackers.com/feed.xml');
-  }
-}
-
-module.exports = new IndieHackers();
+module.exports = IndieHackers;
diff --git a/src/data/sources/mac-rumors.js b/src/data/sources/mac-rumors.js
index 1d9e3e6..a5df743 100644
--- a/src/data/sources/mac-rumors.js
+++ b/src/data/sources/mac-rumors.js
@@ -1,10 +1,6 @@
 const Feed = require('./feed');
 const types = require('../types');
 
-class MacRumors extends Feed {
-  constructor() {
-    super('http://feeds.macrumors.com/MacRumors-All', 'mac-rumors', types.MacRumors);
-  }
-}
+const MacRumors = new Feed('http://feeds.macrumors.com/MacRumors-All', 'mac-rumors', types.MacRumors);
 
-module.exports = new MacRumors();
+module.exports = MacRumors;
diff --git a/src/data/sources/product-hunt.js b/src/data/sources/product-hunt.js
index a890d86..6f8db81 100644
--- a/src/data/sources/product-hunt.js
+++ b/src/data/sources/product-hunt.js
@@ -1,10 +1,6 @@
 const Feed = require('./feed');
 const types = require('../types');
 
-class ProductHunt extends Feed {
-  constructor() {
-    super('https://www.producthunt.com/feed', types.ProductHunt);
-  }
-}
+const ProductHunt = new Feed('https://www.producthunt.com/feed', types.ProductHunt);
 
-module.exports = new ProductHunt();
+module.exports = ProductHunt;
diff --git a/src/data/sources/the-outline.js b/src/data/sources/the-outline.js
index 0c34025..db674f2 100644
--- a/src/data/sources/the-outline.js
+++ b/src/data/sources/the-outline.js
@@ -1,10 +1,6 @@
 const Feed = require('./feed');
 const types = require('../types');
 
-class TheOutline extends Feed {
-  constructor() {
-    super('https://theoutline.com/feeds/recent.rss', types.TheOutline);
-  }
-}
+const TheOutline = new Feed('https://theoutline.com/feeds/recent.rss', types.TheOutline);
 
-module.exports = new TheOutline();
+module.exports = TheOutline;