diff --git a/app/public/bitfinex.py b/app/public/bitfinex.py
index 6760b6d..1a0f973 100644
--- a/app/public/bitfinex.py
+++ b/app/public/bitfinex.py
@@ -9,7 +9,8 @@
 import time
 import utils
 
-class BitFinex_Market(object):
+
+class BitfnexMarket(object):
     """Bitfinex Market Data"""
     def __init__(self):
         self.api_url = settings.BITFINEX_API_URL
diff --git a/app/public/bitmex.py b/app/public/bitmex.py
index f160b7c..8c8a0f4 100644
--- a/app/public/bitmex.py
+++ b/app/public/bitmex.py
@@ -7,7 +7,8 @@
 import requests
 import utils
 
-class BitMex_Market(object):
+
+class BitMexMarket(object):
     """BitMex Market Data"""
     def __init__(self):
         self.api_url = settings.BITMEX_API_URL
diff --git a/app/public/bittrex.py b/app/public/bittrex.py
index d183b73..9745140 100644
--- a/app/public/bittrex.py
+++ b/app/public/bittrex.py
@@ -7,7 +7,8 @@
 import requests
 import utils
 
-class BitTrex_Market(object):
+
+class BitTrexMarket(object):
     """BitTrex Market Data"""
     def __init__(self):
         self.api_url = settings.BITTREX_API_URL
diff --git a/app/public/gdax.py b/app/public/gdax.py
index dc7e1b1..027e6ba 100644
--- a/app/public/gdax.py
+++ b/app/public/gdax.py
@@ -7,7 +7,8 @@
 import requests
 import utils
 
-class GDAX_Market(object):
+
+class GDAXMarket(object):
     """GDAX Market Data"""
     def __init__(self):
         self.api_url = settings.GDAX_API_URL
diff --git a/app/public/gemini.py b/app/public/gemini.py
index 44b16ba..12a217f 100644
--- a/app/public/gemini.py
+++ b/app/public/gemini.py
@@ -7,7 +7,8 @@
 import requests
 import utils
 
-class Gemini_Market(object):
+
+class GeminiMarket(object):
     """Gemini Market Data"""
     def __init__(self):
         self.api_url = settings.GEMINI_API_URL
diff --git a/app/public/kraken.py b/app/public/kraken.py
index 755ad25..fcc2e8c 100644
--- a/app/public/kraken.py
+++ b/app/public/kraken.py
@@ -7,7 +7,8 @@
 import requests
 import utils
 
-class Kraken_Market(object):
+
+class KrakenMarket(object):
     """ETH Kraken Market Data"""
     def __init__(self):
         self.api_url = settings.KRAKEN_API_URL
diff --git a/app/public/okcoin.py b/app/public/okcoin.py
index c316c14..0496748 100644
--- a/app/public/okcoin.py
+++ b/app/public/okcoin.py
@@ -7,7 +7,8 @@
 import requests
 import utils
 
-class OKCoin_Market(object):
+
+class OkCoinMarket(object):
     """OKCOIN Market Data"""
     def __init__(self):
         self.api_url = settings.OKCOIN_API_URL
diff --git a/app/public/poloniex.py b/app/public/poloniex.py
index 7d1e2af..687d1c8 100644
--- a/app/public/poloniex.py
+++ b/app/public/poloniex.py
@@ -7,7 +7,8 @@
 import requests
 import utils
 
-class Poloniex_Market(object):
+
+class PloloniexMarket(object):
     """Poloniex Market Data"""
     def __init__(self):
         self.api_url = settings.POLONIEX_API_URL
diff --git a/app/tracker.py b/app/tracker.py
index a5a8b23..cd5d75e 100644
--- a/app/tracker.py
+++ b/app/tracker.py
@@ -5,14 +5,14 @@
           avelkoski
 """
 from elasticsearch import Elasticsearch, helpers
-from public.bitfinex import BitFinex_Market
-from public.bitmex import BitMex_Market
-from public.bittrex import BitTrex_Market
-from public.gdax import GDAX_Market
-from public.gemini import Gemini_Market
-from public.kraken import Kraken_Market
-from public.okcoin import OKCoin_Market
-from public.poloniex import Poloniex_Market
+from public.bitfinex import BitfnexMarket
+from public.bitmex import BitMexMarket
+from public.bittrex import BitTrexMarket
+from public.gdax import GDAXMarket
+from public.gemini import GeminiMarket
+from public.kraken import KrakenMarket
+from public.okcoin import OkCoinMarket
+from public.poloniex import PloloniexMarket
 from dotenv import Dotenv
 from time import sleep
 import logging
@@ -22,6 +22,18 @@
 import random
 import time
 
+support_exchange = [
+    BitTrexMarket,
+    BitMexMarket,
+    GDAXMarket,
+    GeminiMarket,
+    KrakenMarket,
+    OkCoinMarket,
+    PloloniexMarket,
+    BitfnexMarket
+]
+
+
 def main():
     logging.basicConfig(format='%(levelname)s:%(asctime)s %(message)s',level=settings.LOGLEVEL)
     es = Elasticsearch(settings.ELASTICSEARCH_CONNECT_STRING)
@@ -31,11 +43,9 @@ def main():
 
     sleep(settings.INITIAL_SLEEP)
     logging.info('Application Started.')
-    #supported_exchanges = [BitFinex_Market(), BitMex_Market(), BitTrex_Market(), GDAX_Market(), Gemini_Market(), Kraken_Market(), OKCoin_Market(), Poloniex_Market()]
-    exchanges = [BitFinex_Market(), BitMex_Market(), BitTrex_Market(), GDAX_Market(), Gemini_Market(), Kraken_Market(), OKCoin_Market(), Poloniex_Market()]
+    exchanges = [ex() for ex in support_exchange]
 
-
-    #print active exchanges and create indexes in kibana based on products listed in each market
+    # print active exchanges and create indexes in kibana based on products listed in each market
     for exchange in exchanges:
         logging.info(exchange.exchange + ': activated and indexed.')
         for product, kibana_index in exchange.products.iteritems():
@@ -43,7 +53,7 @@ def main():
 
     logging.warn('Initiating Market Tracking.')
 
-    #Record Ticks
+    # Record Ticks
     while True:
         sleep(settings.MARKET_REFRESH_RATE)
         try:
@@ -54,5 +64,6 @@ def main():
             logging.warning(e)
             sleep(settings.RETRY_RATE)
 
+
 if __name__ == '__main__':
     main()