diff --git a/couchpotato/api.py b/couchpotato/api.py
index ffa78ce..5fdee98 100644
--- a/couchpotato/api.py
+++ b/couchpotato/api.py
@@ -1,15 +1,17 @@
-from couchpotato.core.helpers.request import getParams
-from couchpotato.core.logger import CPLog
 from functools import wraps
 from threading import Thread
-from tornado.gen import coroutine
-from tornado.web import RequestHandler, asynchronous
 import json
 import threading
-import tornado
 import traceback
 import urllib
 
+from couchpotato.core.helpers.request import getParams
+from couchpotato.core.logger import CPLog
+from tornado.gen import coroutine
+from tornado.web import RequestHandler, asynchronous
+import tornado
+
+
 log = CPLog(__name__)
 
 
diff --git a/couchpotato/core/_base/_core.py b/couchpotato/core/_base/_core.py
index ee26651..730bc88 100644
--- a/couchpotato/core/_base/_core.py
+++ b/couchpotato/core/_base/_core.py
@@ -1,10 +1,3 @@
-from couchpotato.api import addApiView
-from couchpotato.core.event import fireEvent, addEvent
-from couchpotato.core.helpers.variable import cleanHost, md5
-from couchpotato.core.logger import CPLog
-from couchpotato.core.plugins.base import Plugin
-from couchpotato.environment import Env
-from tornado.ioloop import IOLoop
 from uuid import uuid4
 import os
 import platform
@@ -13,6 +6,15 @@ import time
 import traceback
 import webbrowser
 
+from couchpotato.api import addApiView
+from couchpotato.core.event import fireEvent, addEvent
+from couchpotato.core.helpers.variable import cleanHost, md5
+from couchpotato.core.logger import CPLog
+from couchpotato.core.plugins.base import Plugin
+from couchpotato.environment import Env
+from tornado.ioloop import IOLoop
+
+
 log = CPLog(__name__)
 
 autoload = 'Core'
diff --git a/couchpotato/core/_base/clientscript.py b/couchpotato/core/_base/clientscript.py
index 42ad28a..593593a 100644
--- a/couchpotato/core/_base/clientscript.py
+++ b/couchpotato/core/_base/clientscript.py
@@ -1,3 +1,7 @@
+import os
+import re
+import traceback
+
 from couchpotato.core.event import addEvent
 from couchpotato.core.helpers.encoding import ss
 from couchpotato.core.helpers.variable import tryInt
@@ -7,9 +11,7 @@ from couchpotato.environment import Env
 from minify.cssmin import cssmin
 from minify.jsmin import jsmin
 from tornado.web import StaticFileHandler
-import os
-import re
-import traceback
+
 
 log = CPLog(__name__)
 
diff --git a/couchpotato/core/_base/scheduler.py b/couchpotato/core/_base/scheduler.py
index ae5bfd3..16a3a4f 100644
--- a/couchpotato/core/_base/scheduler.py
+++ b/couchpotato/core/_base/scheduler.py
@@ -68,6 +68,8 @@ class Scheduler(Plugin):
             'job': self.sched.add_interval_job(handle, hours = hours, minutes = minutes, seconds = seconds)
         }
 
+        return True
+
     def queue(self, handlers = None):
         if not handlers: handlers = []
 
diff --git a/couchpotato/core/_base/updater/__init__.py b/couchpotato/core/_base/updater/__init__.py
index a62eafb..16e08b8 100644
--- a/couchpotato/core/_base/updater/__init__.py
+++ b/couchpotato/core/_base/updater/__init__.py
@@ -1,6 +1,7 @@
+import os
+
 from .main import Updater
 from couchpotato.environment import Env
-import os
 
 
 def autoload():
diff --git a/couchpotato/core/_base/updater/main.py b/couchpotato/core/_base/updater/main.py
index 4f96e92..17ed1bd 100644
--- a/couchpotato/core/_base/updater/main.py
+++ b/couchpotato/core/_base/updater/main.py
@@ -1,29 +1,33 @@
+import json
+import os
+import shutil
+import tarfile
+import time
+import traceback
+import zipfile
+from datetime import datetime
+from threading import RLock
+
 from couchpotato.api import addApiView
 from couchpotato.core.event import addEvent, fireEvent, fireEventAsync
 from couchpotato.core.helpers.encoding import ss
 from couchpotato.core.logger import CPLog
 from couchpotato.core.plugins.base import Plugin
 from couchpotato.environment import Env
-from datetime import datetime
 from dateutil.parser import parse
 from git.repository import LocalRepository
-import json
-import os
-import shutil
-import tarfile
-import time
-import traceback
 from scandir import scandir
 import version
-import zipfile
 from six.moves import filter
 
+
 log = CPLog(__name__)
 
 
 class Updater(Plugin):
 
     available_notified = False
+    _lock = RLock()
 
     def __init__(self):
 
@@ -101,7 +105,17 @@ class Updater(Plugin):
         return False
 
     def info(self, **kwargs):
-        return self.updater.info()
+        self._lock.acquire()
+
+        info = {}
+        try:
+            info = self.updater.info()
+        except:
+            log.error('Failed getting updater info: %s', traceback.format_exc())
+
+        self._lock.release()
+
+        return info
 
     def checkView(self, **kwargs):
         return {
@@ -145,12 +159,15 @@ class BaseUpdater(Plugin):
         pass
 
     def info(self):
+
+        version = self.getVersion()
+
         return {
             'last_check': self.last_check,
             'update_version': self.update_version,
-            'version': self.getVersion(),
+            'version': version,
             'repo_name': '%s/%s' % (self.repo_user, self.repo_name),
-            'branch': self.branch,
+            'branch': version.get('branch', self.branch),
         }
 
     def getVersion(self):
@@ -213,10 +230,11 @@ class GitUpdater(BaseUpdater):
                 output = self.repo.getHead()  # Yes, please
                 log.debug('Git version output: %s', output.hash)
                 self.version = {
-                    'repr': 'git:(%s:%s % s) %s (%s)' % (self.repo_user, self.repo_name, self.branch, output.hash[:8], datetime.fromtimestamp(output.getDate())),
+                    'repr': 'git:(%s:%s % s) %s (%s)' % (self.repo_user, self.repo_name, self.repo.getCurrentBranch().name or self.branch, output.hash[:8], datetime.fromtimestamp(output.getDate())),
                     'hash': output.hash[:8],
                     'date': output.getDate(),
                     'type': 'git',
+                    'branch': self.repo.getCurrentBranch().name
                 }
             except Exception as e:
                 log.error('Failed using GIT updater, running from source, you need to have GIT installed. %s', e)
diff --git a/couchpotato/core/database.py b/couchpotato/core/database.py
index 5922181..33ae0d6 100644
--- a/couchpotato/core/database.py
+++ b/couchpotato/core/database.py
@@ -2,12 +2,14 @@ import json
 import os
 import time
 import traceback
+
 from couchpotato import CPLog
 from couchpotato.api import addApiView
 from couchpotato.core.event import addEvent, fireEvent
 from couchpotato.core.helpers.encoding import toUnicode
 from couchpotato.core.helpers.variable import getImdb
 
+
 log = CPLog(__name__)
 
 
diff --git a/couchpotato/core/downloaders/base.py b/couchpotato/core/downloaders/base.py
index f2a0c1d..bb7db60 100644
--- a/couchpotato/core/downloaders/base.py
+++ b/couchpotato/core/downloaders/base.py
@@ -1,12 +1,14 @@
 from base64 import b32decode, b16encode
+import random
+import re
+
 from couchpotato.api import addApiView
 from couchpotato.core.event import addEvent
 from couchpotato.core.helpers.variable import mergeDicts
 from couchpotato.core.logger import CPLog
-import random
-import re
 from couchpotato.core.media._base.providers.base import Provider
 
+
 log = CPLog(__name__)
 
 
diff --git a/couchpotato/core/downloaders/blackhole.py b/couchpotato/core/downloaders/blackhole.py
index dbacde0..d77e746 100644
--- a/couchpotato/core/downloaders/blackhole.py
+++ b/couchpotato/core/downloaders/blackhole.py
@@ -1,11 +1,13 @@
 from __future__ import with_statement
+import os
+import traceback
+
 from couchpotato.core.downloaders.base import Downloader
 from couchpotato.core.helpers.encoding import sp
 from couchpotato.core.helpers.variable import getDownloadDir
 from couchpotato.core.logger import CPLog
 from couchpotato.environment import Env
-import os
-import traceback
+
 
 log = CPLog(__name__)
 
diff --git a/couchpotato/core/downloaders/deluge.py b/couchpotato/core/downloaders/deluge.py
index 65e4aa9..2a386ad 100644
--- a/couchpotato/core/downloaders/deluge.py
+++ b/couchpotato/core/downloaders/deluge.py
@@ -1,15 +1,17 @@
 from base64 import b64encode, b16encode, b32decode
+from datetime import timedelta
+from hashlib import sha1
+import os.path
+import re
+import traceback
+
 from bencode import bencode as benc, bdecode
 from couchpotato.core.downloaders.base import Downloader, ReleaseDownloadList
 from couchpotato.core.helpers.encoding import isInt, sp
 from couchpotato.core.helpers.variable import tryFloat, cleanHost
 from couchpotato.core.logger import CPLog
-from datetime import timedelta
-from hashlib import sha1
 from synchronousdeluge import DelugeClient
-import os.path
-import re
-import traceback
+
 
 log = CPLog(__name__)
 
diff --git a/couchpotato/core/downloaders/nzbget.py b/couchpotato/core/downloaders/nzbget.py
index 743e276..115e0d2 100644
--- a/couchpotato/core/downloaders/nzbget.py
+++ b/couchpotato/core/downloaders/nzbget.py
@@ -1,8 +1,4 @@
 from base64 import standard_b64encode
-from couchpotato.core.downloaders.base import Downloader, ReleaseDownloadList
-from couchpotato.core.helpers.encoding import ss, sp
-from couchpotato.core.helpers.variable import tryInt, md5, cleanHost
-from couchpotato.core.logger import CPLog
 from datetime import timedelta
 import re
 import shutil
@@ -10,6 +6,12 @@ import socket
 import traceback
 import xmlrpclib
 
+from couchpotato.core.downloaders.base import Downloader, ReleaseDownloadList
+from couchpotato.core.helpers.encoding import ss, sp
+from couchpotato.core.helpers.variable import tryInt, md5, cleanHost
+from couchpotato.core.logger import CPLog
+
+
 log = CPLog(__name__)
 
 autoload = 'NZBGet'
diff --git a/couchpotato/core/downloaders/nzbvortex.py b/couchpotato/core/downloaders/nzbvortex.py
index 1084e66..573e259 100644
--- a/couchpotato/core/downloaders/nzbvortex.py
+++ b/couchpotato/core/downloaders/nzbvortex.py
@@ -1,8 +1,4 @@
 from base64 import b64encode
-from couchpotato.core.downloaders.base import Downloader, ReleaseDownloadList
-from couchpotato.core.helpers.encoding import tryUrlencode, sp
-from couchpotato.core.helpers.variable import cleanHost
-from couchpotato.core.logger import CPLog
 from urllib2 import URLError
 from uuid import uuid4
 import hashlib
@@ -16,6 +12,12 @@ import time
 import traceback
 import urllib2
 
+from couchpotato.core.downloaders.base import Downloader, ReleaseDownloadList
+from couchpotato.core.helpers.encoding import tryUrlencode, sp
+from couchpotato.core.helpers.variable import cleanHost
+from couchpotato.core.logger import CPLog
+
+
 log = CPLog(__name__)
 
 autoload = 'NZBVortex'
diff --git a/couchpotato/core/downloaders/pneumatic.py b/couchpotato/core/downloaders/pneumatic.py
index 823cd38..7500b18 100644
--- a/couchpotato/core/downloaders/pneumatic.py
+++ b/couchpotato/core/downloaders/pneumatic.py
@@ -1,9 +1,11 @@
 from __future__ import with_statement
+import os
+import traceback
+
 from couchpotato.core.downloaders.base import Downloader
 from couchpotato.core.helpers.encoding import sp
 from couchpotato.core.logger import CPLog
-import os
-import traceback
+
 
 log = CPLog(__name__)
 
diff --git a/couchpotato/core/downloaders/rtorrent.py b/couchpotato/core/downloaders/rtorrent.py
index 5ca623a..fb8948c 100644
--- a/couchpotato/core/downloaders/rtorrent.py
+++ b/couchpotato/core/downloaders/rtorrent.py
@@ -1,18 +1,20 @@
+from base64 import b16encode, b32decode
+from datetime import timedelta
+from hashlib import sha1
+from urlparse import urlparse
+import os
+
 from couchpotato.core.downloaders.base import Downloader, ReleaseDownloadList
 from couchpotato.core.event import addEvent
 from couchpotato.core.helpers.encoding import sp
 from couchpotato.core.helpers.variable import cleanHost, splitString
 from couchpotato.core.logger import CPLog
-from base64 import b16encode, b32decode
 from bencode import bencode, bdecode
-from datetime import timedelta
-from hashlib import sha1
 from rtorrent import RTorrent
 from rtorrent.err import MethodError
-from urlparse import urlparse
-import os
 from scandir import scandir
 
+
 log = CPLog(__name__)
 
 autoload = 'rTorrent'
diff --git a/couchpotato/core/downloaders/sabnzbd.py b/couchpotato/core/downloaders/sabnzbd.py
index 33e51fa..548889f 100644
--- a/couchpotato/core/downloaders/sabnzbd.py
+++ b/couchpotato/core/downloaders/sabnzbd.py
@@ -1,14 +1,16 @@
-from couchpotato.core.downloaders.base import Downloader, ReleaseDownloadList
-from couchpotato.core.helpers.encoding import tryUrlencode, ss, sp
-from couchpotato.core.helpers.variable import cleanHost, mergeDicts
-from couchpotato.core.logger import CPLog
-from couchpotato.environment import Env
 from datetime import timedelta
 from urllib2 import URLError
 import json
 import os
 import traceback
 
+from couchpotato.core.downloaders.base import Downloader, ReleaseDownloadList
+from couchpotato.core.helpers.encoding import tryUrlencode, ss, sp
+from couchpotato.core.helpers.variable import cleanHost, mergeDicts
+from couchpotato.core.logger import CPLog
+from couchpotato.environment import Env
+
+
 log = CPLog(__name__)
 
 autoload = 'Sabnzbd'
diff --git a/couchpotato/core/downloaders/synology.py b/couchpotato/core/downloaders/synology.py
index edc732a..46d889f 100644
--- a/couchpotato/core/downloaders/synology.py
+++ b/couchpotato/core/downloaders/synology.py
@@ -1,10 +1,12 @@
+import json
+import traceback
+
 from couchpotato.core.downloaders.base import Downloader
 from couchpotato.core.helpers.encoding import isInt
 from couchpotato.core.helpers.variable import cleanHost
 from couchpotato.core.logger import CPLog
-import json
 import requests
-import traceback
+
 
 log = CPLog(__name__)
 
diff --git a/couchpotato/core/downloaders/transmission.py b/couchpotato/core/downloaders/transmission.py
index a956780..f49cb9d 100644
--- a/couchpotato/core/downloaders/transmission.py
+++ b/couchpotato/core/downloaders/transmission.py
@@ -1,8 +1,4 @@
 from base64 import b64encode
-from couchpotato.core.downloaders.base import Downloader, ReleaseDownloadList
-from couchpotato.core.helpers.encoding import isInt, sp
-from couchpotato.core.helpers.variable import tryInt, tryFloat, cleanHost
-from couchpotato.core.logger import CPLog
 from datetime import timedelta
 import httplib
 import json
@@ -10,6 +6,12 @@ import os.path
 import re
 import urllib2
 
+from couchpotato.core.downloaders.base import Downloader, ReleaseDownloadList
+from couchpotato.core.helpers.encoding import isInt, sp
+from couchpotato.core.helpers.variable import tryInt, tryFloat, cleanHost
+from couchpotato.core.logger import CPLog
+
+
 log = CPLog(__name__)
 
 autoload = 'Transmission'
diff --git a/couchpotato/core/downloaders/utorrent.py b/couchpotato/core/downloaders/utorrent.py
index 345b17e..dae8950 100644
--- a/couchpotato/core/downloaders/utorrent.py
+++ b/couchpotato/core/downloaders/utorrent.py
@@ -1,12 +1,6 @@
 from base64 import b16encode, b32decode
-from bencode import bencode as benc, bdecode
-from couchpotato.core.downloaders.base import Downloader, ReleaseDownloadList
-from couchpotato.core.helpers.encoding import isInt, ss, sp
-from couchpotato.core.helpers.variable import tryInt, tryFloat, cleanHost
-from couchpotato.core.logger import CPLog
 from datetime import timedelta
 from hashlib import sha1
-from multipartpost import MultipartPostHandler
 import cookielib
 import httplib
 import json
@@ -17,6 +11,14 @@ import time
 import urllib
 import urllib2
 
+from bencode import bencode as benc, bdecode
+from couchpotato.core.downloaders.base import Downloader, ReleaseDownloadList
+from couchpotato.core.helpers.encoding import isInt, ss, sp
+from couchpotato.core.helpers.variable import tryInt, tryFloat, cleanHost
+from couchpotato.core.logger import CPLog
+from multipartpost import MultipartPostHandler
+
+
 log = CPLog(__name__)
 
 autoload = 'uTorrent'
diff --git a/couchpotato/core/event.py b/couchpotato/core/event.py
index 8af2967..7246cde 100644
--- a/couchpotato/core/event.py
+++ b/couchpotato/core/event.py
@@ -1,8 +1,10 @@
+import threading
+import traceback
+
 from axl.axel import Event
 from couchpotato.core.helpers.variable import mergeDicts, natsortKey
 from couchpotato.core.logger import CPLog
-import threading
-import traceback
+
 
 log = CPLog(__name__)
 events = {}
diff --git a/couchpotato/core/helpers/encoding.py b/couchpotato/core/helpers/encoding.py
index f896a62..ff6a3e5 100644
--- a/couchpotato/core/helpers/encoding.py
+++ b/couchpotato/core/helpers/encoding.py
@@ -1,12 +1,14 @@
-from couchpotato.core.logger import CPLog
 from string import ascii_letters, digits
 from urllib import quote_plus
 import os
 import re
 import traceback
 import unicodedata
+
+from couchpotato.core.logger import CPLog
 import six
 
+
 log = CPLog(__name__)
 
 
diff --git a/couchpotato/core/helpers/request.py b/couchpotato/core/helpers/request.py
index a0baa85..88bd7a0 100644
--- a/couchpotato/core/helpers/request.py
+++ b/couchpotato/core/helpers/request.py
@@ -1,8 +1,9 @@
-from couchpotato.core.helpers.encoding import toUnicode
-from couchpotato.core.helpers.variable import natsortKey
 from urllib import unquote
 import re
 
+from couchpotato.core.helpers.encoding import toUnicode
+from couchpotato.core.helpers.variable import natsortKey
+
 
 def getParams(params):
 
diff --git a/couchpotato/core/helpers/rss.py b/couchpotato/core/helpers/rss.py
index 1a4d37c..f455007 100644
--- a/couchpotato/core/helpers/rss.py
+++ b/couchpotato/core/helpers/rss.py
@@ -1,6 +1,8 @@
-from couchpotato.core.logger import CPLog
 import xml.etree.ElementTree as XMLTree
 
+from couchpotato.core.logger import CPLog
+
+
 log = CPLog(__name__)
 
 
diff --git a/couchpotato/core/helpers/variable.py b/couchpotato/core/helpers/variable.py
index ede89cc..5eab960 100644
--- a/couchpotato/core/helpers/variable.py
+++ b/couchpotato/core/helpers/variable.py
@@ -1,5 +1,3 @@
-from couchpotato.core.helpers.encoding import simplifyString, toSafeString, ss
-from couchpotato.core.logger import CPLog
 import collections
 import hashlib
 import os
@@ -8,9 +6,13 @@ import random
 import re
 import string
 import sys
+
+from couchpotato.core.helpers.encoding import simplifyString, toSafeString, ss
+from couchpotato.core.logger import CPLog
 import six
 from six.moves import map, zip, filter
 
+
 log = CPLog(__name__)
 
 
diff --git a/couchpotato/core/loader.py b/couchpotato/core/loader.py
index 1b4fc5f..6d84c45 100644
--- a/couchpotato/core/loader.py
+++ b/couchpotato/core/loader.py
@@ -1,11 +1,13 @@
-from couchpotato.core.event import fireEvent
-from couchpotato.core.logger import CPLog
-from importhelper import import_module
 import os
 import sys
 import traceback
+
+from couchpotato.core.event import fireEvent
+from couchpotato.core.logger import CPLog
+from importhelper import import_module
 import six
 
+
 log = CPLog(__name__)
 
 
@@ -124,7 +126,7 @@ class Loader(object):
     def loadPlugins(self, module, name):
 
         if not hasattr(module, 'autoload'):
-            log.debug('Skip startup for plugin %s as it has no start section' % module.__file__)
+            #log.debug('Skip startup for plugin %s as it has no start section' % module.__file__)
             return False
         try:
             # Load single file plugin
diff --git a/couchpotato/core/logger.py b/couchpotato/core/logger.py
index 8223f14..6bbe195 100644
--- a/couchpotato/core/logger.py
+++ b/couchpotato/core/logger.py
@@ -7,6 +7,9 @@ class CPLog(object):
     context = ''
     replace_private = ['api', 'apikey', 'api_key', 'password', 'username', 'h', 'uid', 'key', 'passkey']
 
+    Env = None
+    is_develop = False
+
     def __init__(self, context = ''):
         if context.endswith('.main'):
             context = context[:-5]
@@ -14,6 +17,14 @@ class CPLog(object):
         self.context = context
         self.logger = logging.getLogger()
 
+    def setup(self):
+
+        if not self.Env:
+            from couchpotato.environment import Env
+
+            self.Env = Env
+            self.is_develop = Env.get('dev')
+
     def info(self, msg, replace_tuple = ()):
         self.logger.info(self.addContext(msg, replace_tuple))
 
@@ -37,7 +48,6 @@ class CPLog(object):
 
     def safeMessage(self, msg, replace_tuple = ()):
 
-        from couchpotato.environment import Env
         from couchpotato.core.helpers.encoding import ss, toUnicode
 
         msg = ss(msg)
@@ -53,7 +63,8 @@ class CPLog(object):
             except Exception as e:
                 self.logger.error('Failed encoding stuff to log "%s": %s' % (msg, e))
 
-        if not Env.get('dev'):
+        self.setup()
+        if not self.is_develop:
 
             for replace in self.replace_private:
                 msg = re.sub('(\?%s=)[^\&]+' % replace, '?%s=xxx' % replace, msg)
@@ -61,7 +72,7 @@ class CPLog(object):
 
             # Replace api key
             try:
-                api_key = Env.setting('api_key')
+                api_key = self.Env.setting('api_key')
                 if api_key:
                     msg = msg.replace(api_key, 'API_KEY')
             except:
diff --git a/couchpotato/core/media/__init__.py b/couchpotato/core/media/__init__.py
index aee1a59..97c9839 100644
--- a/couchpotato/core/media/__init__.py
+++ b/couchpotato/core/media/__init__.py
@@ -1,8 +1,10 @@
 import traceback
+
 from couchpotato import get_db, CPLog
 from couchpotato.core.event import addEvent, fireEvent, fireEventAsync
 from couchpotato.core.plugins.base import Plugin
 
+
 log = CPLog(__name__)
 
 
diff --git a/couchpotato/core/media/_base/media/index.py b/couchpotato/core/media/_base/media/index.py
index 956cac5..dc5bab6 100644
--- a/couchpotato/core/media/_base/media/index.py
+++ b/couchpotato/core/media/_base/media/index.py
@@ -1,8 +1,8 @@
-from itertools import izip
 from string import ascii_letters
+from hashlib import md5
+
 from CodernityDB.hash_index import HashIndex
 from CodernityDB.tree_index import MultiTreeBasedIndex, TreeBasedIndex
-from hashlib import md5
 from couchpotato.core.helpers.encoding import toUnicode, simplifyString
 
 
diff --git a/couchpotato/core/media/_base/media/main.py b/couchpotato/core/media/_base/media/main.py
index 0808233..a3d9917 100644
--- a/couchpotato/core/media/_base/media/main.py
+++ b/couchpotato/core/media/_base/media/main.py
@@ -1,4 +1,6 @@
 import traceback
+from string import ascii_lowercase
+
 from couchpotato import tryInt, get_db
 from couchpotato.api import addApiView
 from couchpotato.core.event import fireEvent, fireEventAsync, addEvent
@@ -7,7 +9,7 @@ from couchpotato.core.helpers.variable import splitString, getImdb, getTitle
 from couchpotato.core.logger import CPLog
 from couchpotato.core.media import MediaBase
 from .index import MediaIMDBIndex, MediaStatusIndex, MediaTypeIndex, TitleSearchIndex, TitleIndex, StartsWithIndex
-from string import ascii_lowercase
+
 
 log = CPLog(__name__)
 
diff --git a/couchpotato/core/media/_base/providers/base.py b/couchpotato/core/media/_base/providers/base.py
index 95ab128..94c70a0 100644
--- a/couchpotato/core/media/_base/providers/base.py
+++ b/couchpotato/core/media/_base/providers/base.py
@@ -1,10 +1,3 @@
-from couchpotato.core.event import addEvent, fireEvent
-from couchpotato.core.helpers.encoding import ss
-from couchpotato.core.helpers.variable import tryFloat, mergeDicts, md5, \
-    possibleTitles, getTitle
-from couchpotato.core.logger import CPLog
-from couchpotato.core.plugins.base import Plugin
-from couchpotato.environment import Env
 from urlparse import urlparse
 import json
 import re
@@ -12,6 +5,15 @@ import time
 import traceback
 import xml.etree.ElementTree as XMLTree
 
+from couchpotato.core.event import addEvent, fireEvent
+from couchpotato.core.helpers.encoding import ss
+from couchpotato.core.helpers.variable import tryFloat, mergeDicts, md5, \
+    possibleTitles
+from couchpotato.core.logger import CPLog
+from couchpotato.core.plugins.base import Plugin
+from couchpotato.environment import Env
+
+
 log = CPLog(__name__)
 
 
diff --git a/couchpotato/core/media/_base/providers/nzb/base.py b/couchpotato/core/media/_base/providers/nzb/base.py
index 31cbb47..5e19e52 100644
--- a/couchpotato/core/media/_base/providers/nzb/base.py
+++ b/couchpotato/core/media/_base/providers/nzb/base.py
@@ -1,6 +1,7 @@
-from couchpotato.core.media._base.providers.base import YarrProvider
 import time
 
+from couchpotato.core.media._base.providers.base import YarrProvider
+
 
 class NZBProvider(YarrProvider):
 
diff --git a/couchpotato/core/media/_base/providers/nzb/binsearch.py b/couchpotato/core/media/_base/providers/nzb/binsearch.py
index 0334bb4..270b2a1 100644
--- a/couchpotato/core/media/_base/providers/nzb/binsearch.py
+++ b/couchpotato/core/media/_base/providers/nzb/binsearch.py
@@ -1,10 +1,12 @@
+import re
+import traceback
+
 from bs4 import BeautifulSoup
 from couchpotato.core.helpers.variable import tryInt
 from couchpotato.core.logger import CPLog
-import re
-import traceback
 from couchpotato.core.media._base.providers.nzb.base import NZBProvider
 
+
 log = CPLog(__name__)
 
 
diff --git a/couchpotato/core/media/_base/providers/nzb/newznab.py b/couchpotato/core/media/_base/providers/nzb/newznab.py
index bbc77a3..c643036 100644
--- a/couchpotato/core/media/_base/providers/nzb/newznab.py
+++ b/couchpotato/core/media/_base/providers/nzb/newznab.py
@@ -1,3 +1,9 @@
+from urllib2 import HTTPError
+from urlparse import urlparse
+import time
+import traceback
+import urllib2
+
 from couchpotato.core.helpers.encoding import tryUrlencode, toUnicode
 from couchpotato.core.helpers.rss import RSS
 from couchpotato.core.helpers.variable import cleanHost, splitString, tryInt
@@ -5,11 +11,7 @@ from couchpotato.core.logger import CPLog
 from couchpotato.core.media._base.providers.nzb.base import NZBProvider
 from couchpotato.environment import Env
 from dateutil.parser import parse
-from urllib2 import HTTPError
-from urlparse import urlparse
-import time
-import traceback
-import urllib2
+
 
 log = CPLog(__name__)
 
diff --git a/couchpotato/core/media/_base/providers/nzb/nzbclub.py b/couchpotato/core/media/_base/providers/nzb/nzbclub.py
index 562de5c..6ca6671 100644
--- a/couchpotato/core/media/_base/providers/nzb/nzbclub.py
+++ b/couchpotato/core/media/_base/providers/nzb/nzbclub.py
@@ -1,3 +1,5 @@
+import time
+
 from bs4 import BeautifulSoup
 from couchpotato.core.helpers.encoding import toUnicode
 from couchpotato.core.helpers.rss import RSS
@@ -5,7 +7,7 @@ from couchpotato.core.helpers.variable import tryInt
 from couchpotato.core.logger import CPLog
 from couchpotato.core.media._base.providers.nzb.base import NZBProvider
 from dateutil.parser import parse
-import time
+
 
 log = CPLog(__name__)
 
diff --git a/couchpotato/core/media/_base/providers/nzb/nzbindex.py b/couchpotato/core/media/_base/providers/nzb/nzbindex.py
index c81165e..8baa59a 100644
--- a/couchpotato/core/media/_base/providers/nzb/nzbindex.py
+++ b/couchpotato/core/media/_base/providers/nzb/nzbindex.py
@@ -1,3 +1,6 @@
+import re
+import time
+
 from bs4 import BeautifulSoup
 from couchpotato.core.helpers.encoding import toUnicode
 from couchpotato.core.helpers.rss import RSS
@@ -6,8 +9,7 @@ from couchpotato.core.logger import CPLog
 from couchpotato.core.event import fireEvent
 from couchpotato.core.media._base.providers.nzb.base import NZBProvider
 from dateutil.parser import parse
-import re
-import time
+
 
 log = CPLog(__name__)
 
diff --git a/couchpotato/core/media/_base/providers/nzb/omgwtfnzbs.py b/couchpotato/core/media/_base/providers/nzb/omgwtfnzbs.py
index 2943426..1db101a 100644
--- a/couchpotato/core/media/_base/providers/nzb/omgwtfnzbs.py
+++ b/couchpotato/core/media/_base/providers/nzb/omgwtfnzbs.py
@@ -1,3 +1,6 @@
+from urlparse import urlparse, parse_qs
+import time
+
 from couchpotato.core.event import fireEvent
 from couchpotato.core.helpers.encoding import toUnicode, tryUrlencode
 from couchpotato.core.helpers.rss import RSS
@@ -5,8 +8,7 @@ from couchpotato.core.helpers.variable import tryInt
 from couchpotato.core.logger import CPLog
 from couchpotato.core.media._base.providers.nzb.base import NZBProvider
 from dateutil.parser import parse
-from urlparse import urlparse, parse_qs
-import time
+
 
 log = CPLog(__name__)
 
diff --git a/couchpotato/core/media/_base/providers/torrent/awesomehd.py b/couchpotato/core/media/_base/providers/torrent/awesomehd.py
index f809862..bf10456 100644
--- a/couchpotato/core/media/_base/providers/torrent/awesomehd.py
+++ b/couchpotato/core/media/_base/providers/torrent/awesomehd.py
@@ -1,10 +1,12 @@
+import re
+import traceback
+
 from bs4 import BeautifulSoup
 from couchpotato.core.helpers.variable import tryInt
 from couchpotato.core.logger import CPLog
-import re
-import traceback
 from couchpotato.core.media._base.providers.torrent.base import TorrentProvider
 
+
 log = CPLog(__name__)
 
 
diff --git a/couchpotato/core/media/_base/providers/torrent/base.py b/couchpotato/core/media/_base/providers/torrent/base.py
index ea582e4..585768b 100644
--- a/couchpotato/core/media/_base/providers/torrent/base.py
+++ b/couchpotato/core/media/_base/providers/torrent/base.py
@@ -1,8 +1,10 @@
+import time
+
 from couchpotato.core.helpers.variable import getImdb, md5, cleanHost
 from couchpotato.core.logger import CPLog
 from couchpotato.core.media._base.providers.base import YarrProvider
 from couchpotato.environment import Env
-import time
+
 
 log = CPLog(__name__)
 
diff --git a/couchpotato/core/media/_base/providers/torrent/bithdtv.py b/couchpotato/core/media/_base/providers/torrent/bithdtv.py
index 619ae91..b55bfff 100644
--- a/couchpotato/core/media/_base/providers/torrent/bithdtv.py
+++ b/couchpotato/core/media/_base/providers/torrent/bithdtv.py
@@ -1,10 +1,12 @@
+import traceback
+
 from bs4 import BeautifulSoup
 from couchpotato.core.helpers.encoding import toUnicode
 from couchpotato.core.helpers.variable import tryInt
 from couchpotato.core.logger import CPLog
-import traceback
 from couchpotato.core.media._base.providers.torrent.base import TorrentProvider
 
+
 log = CPLog(__name__)
 
 
diff --git a/couchpotato/core/media/_base/providers/torrent/bitsoup.py b/couchpotato/core/media/_base/providers/torrent/bitsoup.py
index fd2f4db..d841c0f 100644
--- a/couchpotato/core/media/_base/providers/torrent/bitsoup.py
+++ b/couchpotato/core/media/_base/providers/torrent/bitsoup.py
@@ -1,10 +1,12 @@
+import traceback
+
 from bs4 import BeautifulSoup
 from couchpotato.core.helpers.encoding import simplifyString, tryUrlencode
 from couchpotato.core.helpers.variable import tryInt
 from couchpotato.core.logger import CPLog
-import traceback
 from couchpotato.core.media._base.providers.torrent.base import TorrentProvider
 
+
 log = CPLog(__name__)
 
 
diff --git a/couchpotato/core/media/_base/providers/torrent/hdbits.py b/couchpotato/core/media/_base/providers/torrent/hdbits.py
index 4d31bb3..73bfc16 100644
--- a/couchpotato/core/media/_base/providers/torrent/hdbits.py
+++ b/couchpotato/core/media/_base/providers/torrent/hdbits.py
@@ -1,11 +1,12 @@
-from couchpotato.core.helpers.variable import tryInt
-from couchpotato.core.logger import CPLog
-
 import re
 import json
 import traceback
+
+from couchpotato.core.helpers.variable import tryInt
+from couchpotato.core.logger import CPLog
 from couchpotato.core.media._base.providers.torrent.base import TorrentProvider
 
+
 log = CPLog(__name__)
 
 
diff --git a/couchpotato/core/media/_base/providers/torrent/ilovetorrents.py b/couchpotato/core/media/_base/providers/torrent/ilovetorrents.py
index 1f74db4..d9db53b 100644
--- a/couchpotato/core/media/_base/providers/torrent/ilovetorrents.py
+++ b/couchpotato/core/media/_base/providers/torrent/ilovetorrents.py
@@ -1,11 +1,13 @@
+import re
+import traceback
+
 from bs4 import BeautifulSoup
 from couchpotato.core.helpers.encoding import toUnicode, tryUrlencode
 from couchpotato.core.helpers.variable import tryInt
 from couchpotato.core.logger import CPLog
-import re
-import traceback
 from couchpotato.core.media._base.providers.torrent.base import TorrentProvider
 
+
 log = CPLog(__name__)
 
 
diff --git a/couchpotato/core/media/_base/providers/torrent/iptorrents.py b/couchpotato/core/media/_base/providers/torrent/iptorrents.py
index 71302f9..4b9bd79 100644
--- a/couchpotato/core/media/_base/providers/torrent/iptorrents.py
+++ b/couchpotato/core/media/_base/providers/torrent/iptorrents.py
@@ -1,11 +1,13 @@
+import traceback
+
 from bs4 import BeautifulSoup
 from couchpotato.core.helpers.encoding import tryUrlencode
 from couchpotato.core.helpers.variable import tryInt
 from couchpotato.core.logger import CPLog
-import traceback
 from couchpotato.core.media._base.providers.torrent.base import TorrentProvider
 import six
 
+
 log = CPLog(__name__)
 
 
diff --git a/couchpotato/core/media/_base/providers/torrent/kickasstorrents.py b/couchpotato/core/media/_base/providers/torrent/kickasstorrents.py
index f99ead0..8f82e26 100644
--- a/couchpotato/core/media/_base/providers/torrent/kickasstorrents.py
+++ b/couchpotato/core/media/_base/providers/torrent/kickasstorrents.py
@@ -1,10 +1,12 @@
+import re
+import traceback
+
 from bs4 import BeautifulSoup
 from couchpotato.core.helpers.variable import tryInt
 from couchpotato.core.logger import CPLog
-import re
-import traceback
 from couchpotato.core.media._base.providers.torrent.base import TorrentMagnetProvider
 
+
 log = CPLog(__name__)
 
 
diff --git a/couchpotato/core/media/_base/providers/torrent/passthepopcorn.py b/couchpotato/core/media/_base/providers/torrent/passthepopcorn.py
index cb845bf..56550d2 100644
--- a/couchpotato/core/media/_base/providers/torrent/passthepopcorn.py
+++ b/couchpotato/core/media/_base/providers/torrent/passthepopcorn.py
@@ -1,15 +1,17 @@
-from couchpotato.core.helpers.encoding import tryUrlencode
-from couchpotato.core.helpers.variable import getTitle, tryInt, mergeDicts
-from couchpotato.core.logger import CPLog
-from couchpotato.core.media._base.providers.torrent.base import TorrentProvider
-from dateutil.parser import parse
 import htmlentitydefs
 import json
 import re
 import time
 import traceback
+
+from couchpotato.core.helpers.encoding import tryUrlencode
+from couchpotato.core.helpers.variable import getTitle, tryInt, mergeDicts
+from couchpotato.core.logger import CPLog
+from couchpotato.core.media._base.providers.torrent.base import TorrentProvider
+from dateutil.parser import parse
 import six
 
+
 log = CPLog(__name__)
 
 
diff --git a/couchpotato/core/media/_base/providers/torrent/publichd.py b/couchpotato/core/media/_base/providers/torrent/publichd.py
index 39e7f60..c17b655 100644
--- a/couchpotato/core/media/_base/providers/torrent/publichd.py
+++ b/couchpotato/core/media/_base/providers/torrent/publichd.py
@@ -1,13 +1,15 @@
+from urlparse import parse_qs
+import re
+import traceback
+
 from bs4 import BeautifulSoup
 from couchpotato.core.helpers.encoding import tryUrlencode, toUnicode
 from couchpotato.core.helpers.variable import tryInt
 from couchpotato.core.logger import CPLog
-from urlparse import parse_qs
-import re
-import traceback
 from couchpotato.core.media._base.providers.torrent.base import TorrentMagnetProvider
 import six
 
+
 log = CPLog(__name__)
 
 
diff --git a/couchpotato/core/media/_base/providers/torrent/sceneaccess.py b/couchpotato/core/media/_base/providers/torrent/sceneaccess.py
index a8ee615..9a27b05 100644
--- a/couchpotato/core/media/_base/providers/torrent/sceneaccess.py
+++ b/couchpotato/core/media/_base/providers/torrent/sceneaccess.py
@@ -1,10 +1,12 @@
+import traceback
+
 from bs4 import BeautifulSoup
 from couchpotato.core.helpers.encoding import toUnicode
 from couchpotato.core.helpers.variable import tryInt
 from couchpotato.core.logger import CPLog
-import traceback
 from couchpotato.core.media._base.providers.torrent.base import TorrentProvider
 
+
 log = CPLog(__name__)
 
 
diff --git a/couchpotato/core/media/_base/providers/torrent/thepiratebay.py b/couchpotato/core/media/_base/providers/torrent/thepiratebay.py
index f8e631d..b0a778c 100644
--- a/couchpotato/core/media/_base/providers/torrent/thepiratebay.py
+++ b/couchpotato/core/media/_base/providers/torrent/thepiratebay.py
@@ -1,12 +1,14 @@
+import re
+import traceback
+
 from bs4 import BeautifulSoup
 from couchpotato.core.helpers.encoding import toUnicode
 from couchpotato.core.helpers.variable import tryInt
 from couchpotato.core.logger import CPLog
-import re
-import traceback
 from couchpotato.core.media._base.providers.torrent.base import TorrentMagnetProvider
 import six
 
+
 log = CPLog(__name__)
 
 
diff --git a/couchpotato/core/media/_base/providers/torrent/torrentbytes.py b/couchpotato/core/media/_base/providers/torrent/torrentbytes.py
index 603cd6b..afb66eb 100644
--- a/couchpotato/core/media/_base/providers/torrent/torrentbytes.py
+++ b/couchpotato/core/media/_base/providers/torrent/torrentbytes.py
@@ -1,10 +1,12 @@
+import traceback
+
 from bs4 import BeautifulSoup
 from couchpotato.core.helpers.encoding import tryUrlencode
 from couchpotato.core.helpers.variable import tryInt
 from couchpotato.core.logger import CPLog
-import traceback
 from couchpotato.core.media._base.providers.torrent.base import TorrentProvider
 
+
 log = CPLog(__name__)
 
 
diff --git a/couchpotato/core/media/_base/providers/torrent/torrentleech.py b/couchpotato/core/media/_base/providers/torrent/torrentleech.py
index 36bd0f7..208520d 100644
--- a/couchpotato/core/media/_base/providers/torrent/torrentleech.py
+++ b/couchpotato/core/media/_base/providers/torrent/torrentleech.py
@@ -1,10 +1,12 @@
+import traceback
+
 from bs4 import BeautifulSoup
 from couchpotato.core.helpers.variable import tryInt
 from couchpotato.core.logger import CPLog
-import traceback
 from couchpotato.core.media._base.providers.torrent.base import TorrentProvider
 import six
 
+
 log = CPLog(__name__)
 
 
diff --git a/couchpotato/core/media/_base/providers/torrent/torrentpotato.py b/couchpotato/core/media/_base/providers/torrent/torrentpotato.py
index 00ed433..2a17b2a 100644
--- a/couchpotato/core/media/_base/providers/torrent/torrentpotato.py
+++ b/couchpotato/core/media/_base/providers/torrent/torrentpotato.py
@@ -1,11 +1,13 @@
-from couchpotato.core.helpers.encoding import toUnicode
-from couchpotato.core.helpers.variable import splitString, tryInt, tryFloat
-from couchpotato.core.logger import CPLog
 from urlparse import urlparse
 import re
 import traceback
+
+from couchpotato.core.helpers.encoding import toUnicode
+from couchpotato.core.helpers.variable import splitString, tryInt, tryFloat
+from couchpotato.core.logger import CPLog
 from couchpotato.core.media._base.providers.torrent.base import TorrentProvider
 
+
 log = CPLog(__name__)
 
 
diff --git a/couchpotato/core/media/_base/providers/torrent/torrentshack.py b/couchpotato/core/media/_base/providers/torrent/torrentshack.py
index cc2a599..6c9d4cc 100644
--- a/couchpotato/core/media/_base/providers/torrent/torrentshack.py
+++ b/couchpotato/core/media/_base/providers/torrent/torrentshack.py
@@ -1,10 +1,12 @@
+import traceback
+
 from bs4 import BeautifulSoup
 from couchpotato.core.helpers.variable import tryInt
 from couchpotato.core.logger import CPLog
-import traceback
 from couchpotato.core.media._base.providers.torrent.base import TorrentProvider
 import six
 
+
 log = CPLog(__name__)
 
 
diff --git a/couchpotato/core/media/_base/providers/torrent/yify.py b/couchpotato/core/media/_base/providers/torrent/yify.py
index 3ba287a..84ce80b 100644
--- a/couchpotato/core/media/_base/providers/torrent/yify.py
+++ b/couchpotato/core/media/_base/providers/torrent/yify.py
@@ -1,8 +1,10 @@
+import traceback
+
 from couchpotato.core.helpers.variable import tryInt
 from couchpotato.core.logger import CPLog
-import traceback
 from couchpotato.core.media._base.providers.torrent.base import TorrentProvider
 
+
 log = CPLog(__name__)
 
 
diff --git a/couchpotato/core/media/_base/providers/userscript/base.py b/couchpotato/core/media/_base/providers/userscript/base.py
index 531510b..6491ac3 100644
--- a/couchpotato/core/media/_base/providers/userscript/base.py
+++ b/couchpotato/core/media/_base/providers/userscript/base.py
@@ -1,9 +1,11 @@
+from urlparse import urlparse
+
 from couchpotato.core.event import addEvent, fireEvent
 from couchpotato.core.helpers.encoding import simplifyString
 from couchpotato.core.helpers.variable import getImdb, md5
 from couchpotato.core.logger import CPLog
 from couchpotato.core.plugins.base import Plugin
-from urlparse import urlparse
+
 
 log = CPLog(__name__)
 
diff --git a/couchpotato/core/media/_base/searcher/main.py b/couchpotato/core/media/_base/searcher/main.py
index 8c0eaa0..5a28043 100644
--- a/couchpotato/core/media/_base/searcher/main.py
+++ b/couchpotato/core/media/_base/searcher/main.py
@@ -1,11 +1,13 @@
+import datetime
+import re
+
 from couchpotato.api import addApiView
 from couchpotato.core.event import addEvent, fireEvent
 from couchpotato.core.helpers.encoding import simplifyString
 from couchpotato.core.helpers.variable import splitString, removeEmpty, removeDuplicate
 from couchpotato.core.logger import CPLog
 from couchpotato.core.media._base.searcher.base import SearcherBase
-import datetime
-import re
+
 
 log = CPLog(__name__)
 
diff --git a/couchpotato/core/media/movie/_base/__init__.py b/couchpotato/core/media/movie/_base/__init__.py
index acec594..1472046 100644
--- a/couchpotato/core/media/movie/_base/__init__.py
+++ b/couchpotato/core/media/movie/_base/__init__.py
@@ -3,5 +3,3 @@ from .main import MovieBase
 
 def autoload():
     return MovieBase()
-
-config = []
diff --git a/couchpotato/core/media/movie/_base/main.py b/couchpotato/core/media/movie/_base/main.py
index 62f2b2a..8112eda 100644
--- a/couchpotato/core/media/movie/_base/main.py
+++ b/couchpotato/core/media/movie/_base/main.py
@@ -1,5 +1,7 @@
 import os
 import traceback
+import time
+
 from couchpotato import get_db
 from couchpotato.api import addApiView
 from couchpotato.core.event import fireEvent, fireEventAsync, addEvent
@@ -7,9 +9,9 @@ from couchpotato.core.helpers.encoding import toUnicode
 from couchpotato.core.helpers.variable import splitString, getTitle, getImdb
 from couchpotato.core.logger import CPLog
 from couchpotato.core.media.movie import MovieTypeBase
-import time
 import six
 
+
 log = CPLog(__name__)
 
 
diff --git a/couchpotato/core/media/movie/providers/automation/base.py b/couchpotato/core/media/movie/providers/automation/base.py
index 68c259a..5b22865 100644
--- a/couchpotato/core/media/movie/providers/automation/base.py
+++ b/couchpotato/core/media/movie/providers/automation/base.py
@@ -1,9 +1,11 @@
+import time
+
 from couchpotato.core.event import addEvent, fireEvent
 from couchpotato.core.logger import CPLog
 from couchpotato.core.media._base.providers.automation.base import AutomationBase
 from couchpotato.environment import Env
 from couchpotato.core.helpers.variable import splitString
-import time
+
 
 log = CPLog(__name__)
 
diff --git a/couchpotato/core/media/movie/providers/automation/imdb.py b/couchpotato/core/media/movie/providers/automation/imdb.py
index d5b9225..10150f2 100644
--- a/couchpotato/core/media/movie/providers/automation/imdb.py
+++ b/couchpotato/core/media/movie/providers/automation/imdb.py
@@ -5,7 +5,6 @@ from bs4 import BeautifulSoup
 from couchpotato import fireEvent
 from couchpotato.core.helpers.rss import RSS
 from couchpotato.core.helpers.variable import getImdb, splitString, tryInt
-
 from couchpotato.core.logger import CPLog
 from couchpotato.core.media._base.providers.base import MultiProvider
 from couchpotato.core.media.movie.providers.automation.base import Automation
diff --git a/couchpotato/core/media/movie/providers/automation/itunes.py b/couchpotato/core/media/movie/providers/automation/itunes.py
index 1feb96f..bb6eef2 100644
--- a/couchpotato/core/media/movie/providers/automation/itunes.py
+++ b/couchpotato/core/media/movie/providers/automation/itunes.py
@@ -1,12 +1,14 @@
-from couchpotato.core.helpers.rss import RSS
-from couchpotato.core.helpers.variable import md5, splitString, tryInt
-from couchpotato.core.logger import CPLog
-from couchpotato.core.media.movie.providers.automation.base import Automation
 from xml.etree.ElementTree import QName
 import datetime
 import traceback
 import xml.etree.ElementTree as XMLTree
 
+from couchpotato.core.helpers.rss import RSS
+from couchpotato.core.helpers.variable import md5, splitString, tryInt
+from couchpotato.core.logger import CPLog
+from couchpotato.core.media.movie.providers.automation.base import Automation
+
+
 log = CPLog(__name__)
 
 autoload = 'ITunes'
diff --git a/couchpotato/core/media/movie/providers/automation/kinepolis.py b/couchpotato/core/media/movie/providers/automation/kinepolis.py
index 9350572..a0f2596 100644
--- a/couchpotato/core/media/movie/providers/automation/kinepolis.py
+++ b/couchpotato/core/media/movie/providers/automation/kinepolis.py
@@ -1,7 +1,9 @@
+import datetime
+
 from couchpotato.core.helpers.rss import RSS
 from couchpotato.core.logger import CPLog
 from couchpotato.core.media.movie.providers.automation.base import Automation
-import datetime
+
 
 log = CPLog(__name__)
 
diff --git a/couchpotato/core/media/movie/providers/automation/letterboxd.py b/couchpotato/core/media/movie/providers/automation/letterboxd.py
index 55a9549..fa914d8 100644
--- a/couchpotato/core/media/movie/providers/automation/letterboxd.py
+++ b/couchpotato/core/media/movie/providers/automation/letterboxd.py
@@ -1,8 +1,10 @@
+import re
+
 from bs4 import BeautifulSoup
 from couchpotato.core.helpers.variable import tryInt, splitString, removeEmpty
 from couchpotato.core.logger import CPLog
 from couchpotato.core.media.movie.providers.automation.base import Automation
-import re
+
 
 log = CPLog(__name__)
 
diff --git a/couchpotato/core/media/movie/providers/automation/rottentomatoes.py b/couchpotato/core/media/movie/providers/automation/rottentomatoes.py
index 279b4f8..a01f76d 100644
--- a/couchpotato/core/media/movie/providers/automation/rottentomatoes.py
+++ b/couchpotato/core/media/movie/providers/automation/rottentomatoes.py
@@ -1,10 +1,12 @@
+from xml.etree.ElementTree import QName
+import datetime
+import re
+
 from couchpotato.core.helpers.rss import RSS
 from couchpotato.core.helpers.variable import tryInt, splitString
 from couchpotato.core.logger import CPLog
 from couchpotato.core.media.movie.providers.automation.base import Automation
-from xml.etree.ElementTree import QName
-import datetime
-import re
+
 
 log = CPLog(__name__)
 
diff --git a/couchpotato/core/media/movie/providers/automation/trakt.py b/couchpotato/core/media/movie/providers/automation/trakt.py
index 0c94552..440a59d 100644
--- a/couchpotato/core/media/movie/providers/automation/trakt.py
+++ b/couchpotato/core/media/movie/providers/automation/trakt.py
@@ -1,8 +1,10 @@
+import base64
+
 from couchpotato.core.event import addEvent
 from couchpotato.core.helpers.variable import sha1
 from couchpotato.core.logger import CPLog
 from couchpotato.core.media.movie.providers.automation.base import Automation
-import base64
+
 
 log = CPLog(__name__)
 
diff --git a/couchpotato/core/media/movie/providers/info/_modifier.py b/couchpotato/core/media/movie/providers/info/_modifier.py
index 9e82223..20697b0 100644
--- a/couchpotato/core/media/movie/providers/info/_modifier.py
+++ b/couchpotato/core/media/movie/providers/info/_modifier.py
@@ -1,11 +1,13 @@
+import copy
+import traceback
+
 from CodernityDB.database import RecordNotFound
 from couchpotato import get_db
 from couchpotato.core.event import addEvent
 from couchpotato.core.helpers.variable import mergeDicts, randomString
 from couchpotato.core.logger import CPLog
 from couchpotato.core.plugins.base import Plugin
-import copy
-import traceback
+
 
 log = CPLog(__name__)
 
diff --git a/couchpotato/core/media/movie/providers/metadata/base.py b/couchpotato/core/media/movie/providers/metadata/base.py
index 7dacf55..97d5206 100644
--- a/couchpotato/core/media/movie/providers/metadata/base.py
+++ b/couchpotato/core/media/movie/providers/metadata/base.py
@@ -1,11 +1,13 @@
+import os
+import shutil
+import traceback
+
 from couchpotato.core.event import addEvent, fireEvent
 from couchpotato.core.helpers.encoding import sp
 from couchpotato.core.logger import CPLog
 from couchpotato.core.media._base.providers.metadata.base import MetaDataBase
 from couchpotato.environment import Env
-import os
-import shutil
-import traceback
+
 
 log = CPLog(__name__)
 
diff --git a/couchpotato/core/media/movie/providers/metadata/wmc.py b/couchpotato/core/media/movie/providers/metadata/wmc.py
index 50db02d..8faa6d2 100644
--- a/couchpotato/core/media/movie/providers/metadata/wmc.py
+++ b/couchpotato/core/media/movie/providers/metadata/wmc.py
@@ -1,6 +1,8 @@
-from couchpotato.core.media.movie.providers.metadata.base import MovieMetaData
 import os
 
+from couchpotato.core.media.movie.providers.metadata.base import MovieMetaData
+
+
 autoload = 'WindowsMediaCenter'
 
 
diff --git a/couchpotato/core/media/movie/providers/metadata/xbmc.py b/couchpotato/core/media/movie/providers/metadata/xbmc.py
index e9904cf..9f6bb7d 100644
--- a/couchpotato/core/media/movie/providers/metadata/xbmc.py
+++ b/couchpotato/core/media/movie/providers/metadata/xbmc.py
@@ -1,13 +1,15 @@
-from couchpotato.core.media.movie.providers.metadata.base import MovieMetaData
-from couchpotato.core.helpers.encoding import toUnicode
-from couchpotato.core.helpers.variable import getTitle
-from couchpotato.core.logger import CPLog
 from xml.etree.ElementTree import Element, SubElement, tostring
 import os
 import re
 import traceback
 import xml.dom.minidom
 
+from couchpotato.core.media.movie.providers.metadata.base import MovieMetaData
+from couchpotato.core.helpers.encoding import toUnicode
+from couchpotato.core.helpers.variable import getTitle
+from couchpotato.core.logger import CPLog
+
+
 log = CPLog(__name__)
 
 autoload = 'XBMC'
diff --git a/couchpotato/core/media/movie/providers/trailer/hdtrailers.py b/couchpotato/core/media/movie/providers/trailer/hdtrailers.py
index 1f5b4f6..084c8ea 100644
--- a/couchpotato/core/media/movie/providers/trailer/hdtrailers.py
+++ b/couchpotato/core/media/movie/providers/trailer/hdtrailers.py
@@ -1,12 +1,14 @@
+from string import digits, ascii_letters
+from urllib2 import HTTPError
+import re
+
 from bs4 import SoupStrainer, BeautifulSoup
 from couchpotato.core.helpers.encoding import tryUrlencode
 from couchpotato.core.helpers.variable import mergeDicts, getTitle
 from couchpotato.core.logger import CPLog
-from string import digits, ascii_letters
-from urllib2 import HTTPError
-import re
 from couchpotato.core.media.movie.providers.trailer.base import TrailerProvider
 
+
 log = CPLog(__name__)
 
 autoload = 'HDTrailers'
diff --git a/couchpotato/core/media/movie/providers/userscript/allocine.py b/couchpotato/core/media/movie/providers/userscript/allocine.py
index 2eaef42..238a6b5 100644
--- a/couchpotato/core/media/movie/providers/userscript/allocine.py
+++ b/couchpotato/core/media/movie/providers/userscript/allocine.py
@@ -1,7 +1,9 @@
-from couchpotato.core.logger import CPLog
 import traceback
+
+from couchpotato.core.logger import CPLog
 from couchpotato.core.media._base.providers.userscript.base import UserscriptBase
 
+
 log = CPLog(__name__)
 
 autoload = 'AlloCine'
diff --git a/couchpotato/core/media/movie/providers/userscript/appletrailers.py b/couchpotato/core/media/movie/providers/userscript/appletrailers.py
index af201ed..c59722c 100644
--- a/couchpotato/core/media/movie/providers/userscript/appletrailers.py
+++ b/couchpotato/core/media/movie/providers/userscript/appletrailers.py
@@ -1,6 +1,8 @@
-from couchpotato.core.media._base.providers.userscript.base import UserscriptBase
 import re
 
+from couchpotato.core.media._base.providers.userscript.base import UserscriptBase
+
+
 autoload = 'AppleTrailers'
 
 
diff --git a/couchpotato/core/media/movie/providers/userscript/filmweb.py b/couchpotato/core/media/movie/providers/userscript/filmweb.py
index f4e3652..a4a51a0 100644
--- a/couchpotato/core/media/movie/providers/userscript/filmweb.py
+++ b/couchpotato/core/media/movie/providers/userscript/filmweb.py
@@ -1,6 +1,8 @@
-from couchpotato.core.media._base.providers.userscript.base import UserscriptBase
 import re
 
+from couchpotato.core.media._base.providers.userscript.base import UserscriptBase
+
+
 autoload = 'Filmweb'
 
 
diff --git a/couchpotato/core/media/movie/providers/userscript/flickchart.py b/couchpotato/core/media/movie/providers/userscript/flickchart.py
index 2df0acf..c54a8ca 100644
--- a/couchpotato/core/media/movie/providers/userscript/flickchart.py
+++ b/couchpotato/core/media/movie/providers/userscript/flickchart.py
@@ -1,7 +1,9 @@
+import traceback
+
 from couchpotato.core.event import fireEvent
 from couchpotato.core.logger import CPLog
 from couchpotato.core.media._base.providers.userscript.base import UserscriptBase
-import traceback
+
 
 log = CPLog(__name__)
 
diff --git a/couchpotato/core/media/movie/providers/userscript/rottentomatoes.py b/couchpotato/core/media/movie/providers/userscript/rottentomatoes.py
index cb66146..902192e 100644
--- a/couchpotato/core/media/movie/providers/userscript/rottentomatoes.py
+++ b/couchpotato/core/media/movie/providers/userscript/rottentomatoes.py
@@ -1,8 +1,10 @@
-from couchpotato.core.logger import CPLog
-from couchpotato.core.media._base.providers.userscript.base import UserscriptBase
 import re
 import traceback
 
+from couchpotato.core.logger import CPLog
+from couchpotato.core.media._base.providers.userscript.base import UserscriptBase
+
+
 log = CPLog(__name__)
 
 autoload = 'RottenTomatoes'
diff --git a/couchpotato/core/media/movie/providers/userscript/tmdb.py b/couchpotato/core/media/movie/providers/userscript/tmdb.py
index 71ab0d7..f11dba2 100644
--- a/couchpotato/core/media/movie/providers/userscript/tmdb.py
+++ b/couchpotato/core/media/movie/providers/userscript/tmdb.py
@@ -1,6 +1,8 @@
+import re
+
 from couchpotato.core.event import fireEvent
 from couchpotato.core.media._base.providers.userscript.base import UserscriptBase
-import re
+
 
 autoload = 'TMDB'
 
diff --git a/couchpotato/core/media/movie/providers/userscript/youteather.py b/couchpotato/core/media/movie/providers/userscript/youteather.py
index 3a35df3..e7e63b4 100644
--- a/couchpotato/core/media/movie/providers/userscript/youteather.py
+++ b/couchpotato/core/media/movie/providers/userscript/youteather.py
@@ -1,6 +1,8 @@
-from couchpotato.core.media._base.providers.userscript.base import UserscriptBase
 import re
 
+from couchpotato.core.media._base.providers.userscript.base import UserscriptBase
+
+
 autoload = 'YouTheater'
 
 
diff --git a/couchpotato/core/media/movie/searcher.py b/couchpotato/core/media/movie/searcher.py
index 192040f..2043d01 100644
--- a/couchpotato/core/media/movie/searcher.py
+++ b/couchpotato/core/media/movie/searcher.py
@@ -1,3 +1,9 @@
+from datetime import date
+import random
+import re
+import time
+import traceback
+
 from couchpotato import get_db
 from couchpotato.api import addApiView
 from couchpotato.core.event import addEvent, fireEvent, fireEventAsync
@@ -7,11 +13,7 @@ from couchpotato.core.logger import CPLog
 from couchpotato.core.media._base.searcher.base import SearcherBase
 from couchpotato.core.media.movie import MovieTypeBase
 from couchpotato.environment import Env
-from datetime import date
-import random
-import re
-import time
-import traceback
+
 
 log = CPLog(__name__)
 
diff --git a/couchpotato/core/media/movie/suggestion/__init__.py b/couchpotato/core/media/movie/suggestion/__init__.py
index 50083fe..81e42f0 100644
--- a/couchpotato/core/media/movie/suggestion/__init__.py
+++ b/couchpotato/core/media/movie/suggestion/__init__.py
@@ -3,5 +3,3 @@ from .main import Suggestion
 
 def start():
     return Suggestion()
-
-config = []
diff --git a/couchpotato/core/notifications/boxcar.py b/couchpotato/core/notifications/boxcar.py
index f5006ef..3777a42 100644
--- a/couchpotato/core/notifications/boxcar.py
+++ b/couchpotato/core/notifications/boxcar.py
@@ -1,7 +1,9 @@
+import time
+
 from couchpotato.core.helpers.encoding import toUnicode
 from couchpotato.core.logger import CPLog
 from couchpotato.core.notifications.base import Notification
-import time
+
 
 log = CPLog(__name__)
 
diff --git a/couchpotato/core/notifications/core/index.py b/couchpotato/core/notifications/core/index.py
index 6d65b90..c7985b5 100644
--- a/couchpotato/core/notifications/core/index.py
+++ b/couchpotato/core/notifications/core/index.py
@@ -1,4 +1,3 @@
-import time
 from CodernityDB.tree_index import TreeBasedIndex
 
 
diff --git a/couchpotato/core/notifications/core/main.py b/couchpotato/core/notifications/core/main.py
index eefa0dc..1a506c1 100644
--- a/couchpotato/core/notifications/core/main.py
+++ b/couchpotato/core/notifications/core/main.py
@@ -1,3 +1,9 @@
+from operator import itemgetter
+import threading
+import time
+import traceback
+import uuid
+
 from couchpotato import get_db
 from couchpotato.api import addApiView, addNonBlockApiView
 from couchpotato.core.event import addEvent, fireEvent
@@ -7,11 +13,7 @@ from couchpotato.core.logger import CPLog
 from couchpotato.core.notifications.base import Notification
 from .index import NotificationIndex, NotificationUnreadIndex
 from couchpotato.environment import Env
-from operator import itemgetter
-import threading
-import time
-import traceback
-import uuid
+
 
 log = CPLog(__name__)
 
diff --git a/couchpotato/core/notifications/email.py b/couchpotato/core/notifications/email.py
index 0a9ff06..b42650b 100644
--- a/couchpotato/core/notifications/email.py
+++ b/couchpotato/core/notifications/email.py
@@ -1,12 +1,14 @@
+from email.mime.text import MIMEText
+from email.utils import formatdate, make_msgid
+import smtplib
+import traceback
+
 from couchpotato.core.helpers.encoding import toUnicode
 from couchpotato.core.helpers.variable import splitString
 from couchpotato.core.logger import CPLog
 from couchpotato.core.notifications.base import Notification
 from couchpotato.environment import Env
-from email.mime.text import MIMEText
-from email.utils import formatdate, make_msgid
-import smtplib
-import traceback
+
 
 log = CPLog(__name__)
 
diff --git a/couchpotato/core/notifications/growl.py b/couchpotato/core/notifications/growl.py
index 8d67efc..c7847da 100644
--- a/couchpotato/core/notifications/growl.py
+++ b/couchpotato/core/notifications/growl.py
@@ -1,9 +1,11 @@
+import traceback
+
 from couchpotato.core.event import fireEvent, addEvent
 from couchpotato.core.logger import CPLog
 from couchpotato.core.notifications.base import Notification
 from couchpotato.environment import Env
 from gntp import notifier
-import traceback
+
 
 log = CPLog(__name__)
 
diff --git a/couchpotato/core/notifications/nmj.py b/couchpotato/core/notifications/nmj.py
index 12bb2ad..6ef70d4 100644
--- a/couchpotato/core/notifications/nmj.py
+++ b/couchpotato/core/notifications/nmj.py
@@ -1,10 +1,12 @@
+import re
+import telnetlib
+
 from couchpotato.api import addApiView
 from couchpotato.core.event import addEvent
 from couchpotato.core.helpers.encoding import tryUrlencode
 from couchpotato.core.logger import CPLog
 from couchpotato.core.notifications.base import Notification
-import re
-import telnetlib
+
 
 try:
     import xml.etree.cElementTree as etree
diff --git a/couchpotato/core/notifications/plex/client.py b/couchpotato/core/notifications/plex/client.py
index 8864230..84cf7af 100644
--- a/couchpotato/core/notifications/plex/client.py
+++ b/couchpotato/core/notifications/plex/client.py
@@ -1,9 +1,11 @@
 import json
+
 from couchpotato import CPLog
 from couchpotato.core.event import addEvent
 from couchpotato.core.helpers.encoding import tryUrlencode
 import requests
 
+
 log = CPLog(__name__)
 
 
diff --git a/couchpotato/core/notifications/plex/server.py b/couchpotato/core/notifications/plex/server.py
index b66db8f..cd11f49 100644
--- a/couchpotato/core/notifications/plex/server.py
+++ b/couchpotato/core/notifications/plex/server.py
@@ -1,9 +1,10 @@
 from datetime import timedelta, datetime
-from couchpotato.core.helpers.variable import cleanHost
-from couchpotato import CPLog
 from urlparse import urlparse
 import traceback
 
+from couchpotato.core.helpers.variable import cleanHost
+from couchpotato import CPLog
+
 
 try:
     import xml.etree.cElementTree as etree
diff --git a/couchpotato/core/notifications/prowl.py b/couchpotato/core/notifications/prowl.py
index ecadb7f..b276d7f 100644
--- a/couchpotato/core/notifications/prowl.py
+++ b/couchpotato/core/notifications/prowl.py
@@ -1,7 +1,9 @@
+import traceback
+
 from couchpotato.core.helpers.encoding import toUnicode
 from couchpotato.core.logger import CPLog
 from couchpotato.core.notifications.base import Notification
-import traceback
+
 
 log = CPLog(__name__)
 
diff --git a/couchpotato/core/notifications/pushalot.py b/couchpotato/core/notifications/pushalot.py
index 9f717e4..0ce9027 100644
--- a/couchpotato/core/notifications/pushalot.py
+++ b/couchpotato/core/notifications/pushalot.py
@@ -1,7 +1,9 @@
+import traceback
+
 from couchpotato.core.helpers.encoding import toUnicode
 from couchpotato.core.logger import CPLog
 from couchpotato.core.notifications.base import Notification
-import traceback
+
 
 log = CPLog(__name__)
 
diff --git a/couchpotato/core/notifications/pushbullet.py b/couchpotato/core/notifications/pushbullet.py
index beda0b3..fd1a376 100644
--- a/couchpotato/core/notifications/pushbullet.py
+++ b/couchpotato/core/notifications/pushbullet.py
@@ -1,9 +1,11 @@
+import base64
+import json
+
 from couchpotato.core.helpers.encoding import toUnicode
 from couchpotato.core.helpers.variable import splitString
 from couchpotato.core.logger import CPLog
 from couchpotato.core.notifications.base import Notification
-import base64
-import json
+
 
 log = CPLog(__name__)
 
diff --git a/couchpotato/core/notifications/pushover.py b/couchpotato/core/notifications/pushover.py
index c5e5257..9559374 100644
--- a/couchpotato/core/notifications/pushover.py
+++ b/couchpotato/core/notifications/pushover.py
@@ -1,8 +1,10 @@
+from httplib import HTTPSConnection
+
 from couchpotato.core.helpers.encoding import toUnicode, tryUrlencode
 from couchpotato.core.helpers.variable import getTitle
 from couchpotato.core.logger import CPLog
 from couchpotato.core.notifications.base import Notification
-from httplib import HTTPSConnection
+
 
 log = CPLog(__name__)
 
diff --git a/couchpotato/core/notifications/synoindex.py b/couchpotato/core/notifications/synoindex.py
index 7fd2084..cd4ff8f 100644
--- a/couchpotato/core/notifications/synoindex.py
+++ b/couchpotato/core/notifications/synoindex.py
@@ -1,8 +1,10 @@
+import os
+import subprocess
+
 from couchpotato.core.event import addEvent
 from couchpotato.core.logger import CPLog
 from couchpotato.core.notifications.base import Notification
-import os
-import subprocess
+
 
 log = CPLog(__name__)
 
diff --git a/couchpotato/core/notifications/toasty.py b/couchpotato/core/notifications/toasty.py
index d0bbe8a..919a9d1 100644
--- a/couchpotato/core/notifications/toasty.py
+++ b/couchpotato/core/notifications/toasty.py
@@ -1,7 +1,9 @@
+import traceback
+
 from couchpotato.core.helpers.encoding import toUnicode, tryUrlencode
 from couchpotato.core.logger import CPLog
 from couchpotato.core.notifications.base import Notification
-import traceback
+
 
 log = CPLog(__name__)
 
diff --git a/couchpotato/core/notifications/twitter/main.py b/couchpotato/core/notifications/twitter/main.py
index 559c830..0d02191 100644
--- a/couchpotato/core/notifications/twitter/main.py
+++ b/couchpotato/core/notifications/twitter/main.py
@@ -1,3 +1,5 @@
+from urlparse import parse_qsl
+
 from couchpotato.api import addApiView
 from couchpotato.core.helpers.encoding import tryUrlencode
 from couchpotato.core.helpers.variable import cleanHost
@@ -5,9 +7,9 @@ from couchpotato.core.logger import CPLog
 from couchpotato.core.notifications.base import Notification
 from couchpotato.environment import Env
 from pytwitter import Api
-from urlparse import parse_qsl
 import oauth2
 
+
 log = CPLog(__name__)
 
 
diff --git a/couchpotato/core/notifications/xbmc.py b/couchpotato/core/notifications/xbmc.py
index 48c5c9b..682801c 100644
--- a/couchpotato/core/notifications/xbmc.py
+++ b/couchpotato/core/notifications/xbmc.py
@@ -1,14 +1,16 @@
-from couchpotato.core.helpers.variable import splitString, getTitle
-from couchpotato.core.logger import CPLog
-from couchpotato.core.notifications.base import Notification
 import base64
 import json
 import socket
 import traceback
 import urllib
+
+from couchpotato.core.helpers.variable import splitString, getTitle
+from couchpotato.core.logger import CPLog
+from couchpotato.core.notifications.base import Notification
 import requests
 from requests.packages.urllib3.exceptions import MaxRetryError
 
+
 log = CPLog(__name__)
 
 autoload = 'XBMC'
diff --git a/couchpotato/core/notifications/xmpp.py b/couchpotato/core/notifications/xmpp.py
index 6a978e5..f9916cd 100644
--- a/couchpotato/core/notifications/xmpp.py
+++ b/couchpotato/core/notifications/xmpp.py
@@ -1,9 +1,11 @@
-from couchpotato.core.logger import CPLog
-from couchpotato.core.notifications.base import Notification
 from time import sleep
 import traceback
+
+from couchpotato.core.logger import CPLog
+from couchpotato.core.notifications.base import Notification
 import xmpp
 
+
 log = CPLog(__name__)
 
 autoload = 'Xmpp'
diff --git a/couchpotato/core/plugins/base.py b/couchpotato/core/plugins/base.py
index 7744023..2bd15e5 100644
--- a/couchpotato/core/plugins/base.py
+++ b/couchpotato/core/plugins/base.py
@@ -1,3 +1,12 @@
+from urlparse import urlparse
+import glob
+import inspect
+import os.path
+import re
+import time
+import traceback
+import urllib2
+
 from couchpotato import get_db
 from couchpotato.core.event import fireEvent, addEvent
 from couchpotato.core.helpers.encoding import ss, toSafeString, \
@@ -10,14 +19,7 @@ from requests.packages.urllib3 import Timeout
 from requests.packages.urllib3.exceptions import MaxRetryError
 from tornado import template
 from tornado.web import StaticFileHandler
-from urlparse import urlparse
-import glob
-import inspect
-import os.path
-import re
-import time
-import traceback
-import urllib2
+
 
 log = CPLog(__name__)
 
diff --git a/couchpotato/core/plugins/browser.py b/couchpotato/core/plugins/browser.py
index 8bfe53c..9492a2d 100644
--- a/couchpotato/core/plugins/browser.py
+++ b/couchpotato/core/plugins/browser.py
@@ -1,11 +1,13 @@
-from couchpotato.api import addApiView
-from couchpotato.core.helpers.variable import getUserDir
-from couchpotato.core.plugins.base import Plugin
 import ctypes
 import os
 import string
+
+from couchpotato.api import addApiView
+from couchpotato.core.helpers.variable import getUserDir
+from couchpotato.core.plugins.base import Plugin
 import six
 
+
 if os.name == 'nt':
     import imp
     try:
diff --git a/couchpotato/core/plugins/category/main.py b/couchpotato/core/plugins/category/main.py
index e68b62c..a0852cc 100644
--- a/couchpotato/core/plugins/category/main.py
+++ b/couchpotato/core/plugins/category/main.py
@@ -1,4 +1,5 @@
 import traceback
+
 from couchpotato import get_db
 from couchpotato.api import addApiView
 from couchpotato.core.event import addEvent
@@ -7,6 +8,7 @@ from couchpotato.core.logger import CPLog
 from couchpotato.core.plugins.base import Plugin
 from .index import CategoryIndex, CategoryMediaIndex
 
+
 log = CPLog(__name__)
 
 
diff --git a/couchpotato/core/plugins/custom.py b/couchpotato/core/plugins/custom.py
index c9cff3e..20b4c3f 100644
--- a/couchpotato/core/plugins/custom.py
+++ b/couchpotato/core/plugins/custom.py
@@ -1,8 +1,10 @@
+import os
+
 from couchpotato.core.event import addEvent
 from couchpotato.core.logger import CPLog
 from couchpotato.core.plugins.base import Plugin
 from couchpotato.environment import Env
-import os
+
 
 log = CPLog(__name__)
 
diff --git a/couchpotato/core/plugins/dashboard.py b/couchpotato/core/plugins/dashboard.py
index 4a9aaf9..57cd7af 100644
--- a/couchpotato/core/plugins/dashboard.py
+++ b/couchpotato/core/plugins/dashboard.py
@@ -1,12 +1,14 @@
 from datetime import date
+import random as rndm
+import time
+
 from couchpotato import get_db
 from couchpotato.api import addApiView
 from couchpotato.core.event import fireEvent
 from couchpotato.core.helpers.variable import splitString, tryInt
 from couchpotato.core.logger import CPLog
 from couchpotato.core.plugins.base import Plugin
-import random as rndm
-import time
+
 
 log = CPLog(__name__)
 
diff --git a/couchpotato/core/plugins/file.py b/couchpotato/core/plugins/file.py
index 4110437..77b3ba8 100644
--- a/couchpotato/core/plugins/file.py
+++ b/couchpotato/core/plugins/file.py
@@ -1,3 +1,7 @@
+import os.path
+import time
+import traceback
+
 from couchpotato import get_db
 from couchpotato.api import addApiView
 from couchpotato.core.event import addEvent
@@ -8,9 +12,7 @@ from couchpotato.core.plugins.base import Plugin
 from couchpotato.environment import Env
 from scandir import scandir
 from tornado.web import StaticFileHandler
-import os.path
-import time
-import traceback
+
 
 log = CPLog(__name__)
 
diff --git a/couchpotato/core/plugins/log/main.py b/couchpotato/core/plugins/log/main.py
index 2f47158..ced069e 100644
--- a/couchpotato/core/plugins/log/main.py
+++ b/couchpotato/core/plugins/log/main.py
@@ -1,11 +1,13 @@
+import os
+import traceback
+
 from couchpotato.api import addApiView
 from couchpotato.core.helpers.encoding import toUnicode
 from couchpotato.core.helpers.variable import tryInt
 from couchpotato.core.logger import CPLog
 from couchpotato.core.plugins.base import Plugin
 from couchpotato.environment import Env
-import os
-import traceback
+
 
 log = CPLog(__name__)
 
diff --git a/couchpotato/core/plugins/manage.py b/couchpotato/core/plugins/manage.py
index 205de13..e1e084f 100644
--- a/couchpotato/core/plugins/manage.py
+++ b/couchpotato/core/plugins/manage.py
@@ -1,3 +1,9 @@
+import ctypes
+import os
+import sys
+import time
+import traceback
+
 from couchpotato import get_db
 from couchpotato.api import addApiView
 from couchpotato.core.event import fireEvent, addEvent, fireEventAsync
@@ -6,11 +12,7 @@ from couchpotato.core.helpers.variable import splitString, getTitle, tryInt
 from couchpotato.core.logger import CPLog
 from couchpotato.core.plugins.base import Plugin
 from couchpotato.environment import Env
-import ctypes
-import os
-import sys
-import time
-import traceback
+
 
 log = CPLog(__name__)
 
diff --git a/couchpotato/core/plugins/profile/main.py b/couchpotato/core/plugins/profile/main.py
index c978e6a..8f838f4 100644
--- a/couchpotato/core/plugins/profile/main.py
+++ b/couchpotato/core/plugins/profile/main.py
@@ -1,4 +1,5 @@
 import traceback
+
 from couchpotato import get_db, tryInt
 from couchpotato.api import addApiView
 from couchpotato.core.event import addEvent
@@ -7,6 +8,7 @@ from couchpotato.core.logger import CPLog
 from couchpotato.core.plugins.base import Plugin
 from .index import ProfileIndex
 
+
 log = CPLog(__name__)
 
 
diff --git a/couchpotato/core/plugins/quality/__init__.py b/couchpotato/core/plugins/quality/__init__.py
index fc9cda6..7710251 100644
--- a/couchpotato/core/plugins/quality/__init__.py
+++ b/couchpotato/core/plugins/quality/__init__.py
@@ -3,5 +3,3 @@ from .main import QualityPlugin
 
 def autoload():
     return QualityPlugin()
-
-config = []
diff --git a/couchpotato/core/plugins/quality/index.py b/couchpotato/core/plugins/quality/index.py
index 6d160a7..7804397 100644
--- a/couchpotato/core/plugins/quality/index.py
+++ b/couchpotato/core/plugins/quality/index.py
@@ -1,6 +1,7 @@
-from CodernityDB.hash_index import HashIndex
 from hashlib import md5
 
+from CodernityDB.hash_index import HashIndex
+
 
 class QualityIndex(HashIndex):
     _version = 1
diff --git a/couchpotato/core/plugins/quality/main.py b/couchpotato/core/plugins/quality/main.py
index 96a22f4..ee06d4c 100644
--- a/couchpotato/core/plugins/quality/main.py
+++ b/couchpotato/core/plugins/quality/main.py
@@ -1,4 +1,6 @@
 import traceback
+import re
+
 from couchpotato import get_db
 from couchpotato.api import addApiView
 from couchpotato.core.event import addEvent
@@ -7,7 +9,7 @@ from couchpotato.core.helpers.variable import mergeDicts, getExt
 from couchpotato.core.logger import CPLog
 from couchpotato.core.plugins.base import Plugin
 from couchpotato.core.plugins.quality.index import QualityIndex
-import re
+
 
 log = CPLog(__name__)
 
diff --git a/couchpotato/core/plugins/release/index.py b/couchpotato/core/plugins/release/index.py
index d6978bb..ee76253 100644
--- a/couchpotato/core/plugins/release/index.py
+++ b/couchpotato/core/plugins/release/index.py
@@ -1,4 +1,5 @@
 from hashlib import md5
+
 from CodernityDB.hash_index import HashIndex
 from CodernityDB.tree_index import TreeBasedIndex
 
diff --git a/couchpotato/core/plugins/release/main.py b/couchpotato/core/plugins/release/main.py
index d8e99a7..66ca7a3 100644
--- a/couchpotato/core/plugins/release/main.py
+++ b/couchpotato/core/plugins/release/main.py
@@ -1,3 +1,8 @@
+from inspect import ismethod, isfunction
+import os
+import time
+import traceback
+
 from couchpotato import md5, get_db
 from couchpotato.api import addApiView
 from couchpotato.core.event import fireEvent, addEvent
@@ -7,10 +12,7 @@ from couchpotato.core.logger import CPLog
 from couchpotato.core.plugins.base import Plugin
 from .index import ReleaseIndex, ReleaseStatusIndex, ReleaseIDIndex, ReleaseDownloadIndex
 from couchpotato.environment import Env
-from inspect import ismethod, isfunction
-import os
-import time
-import traceback
+
 
 log = CPLog(__name__)
 
diff --git a/couchpotato/core/plugins/renamer.py b/couchpotato/core/plugins/renamer.py
index 7e4fc99..585f689 100644
--- a/couchpotato/core/plugins/renamer.py
+++ b/couchpotato/core/plugins/renamer.py
@@ -1,3 +1,10 @@
+import fnmatch
+import os
+import re
+import shutil
+import time
+import traceback
+
 from couchpotato import get_db
 from couchpotato.api import addApiView
 from couchpotato.core.event import addEvent, fireEvent, fireEventAsync
@@ -9,15 +16,10 @@ from couchpotato.core.plugins.base import Plugin
 from couchpotato.environment import Env
 from scandir import scandir
 from unrar2 import RarFile
-import fnmatch
-import os
-import re
-import shutil
-import time
-import traceback
 import six
 from six.moves import filter
 
+
 log = CPLog(__name__)
 
 autoload = 'Renamer'
diff --git a/couchpotato/core/plugins/scanner.py b/couchpotato/core/plugins/scanner.py
index 3ed5079..e444489 100644
--- a/couchpotato/core/plugins/scanner.py
+++ b/couchpotato/core/plugins/scanner.py
@@ -1,3 +1,9 @@
+import os
+import re
+import threading
+import time
+import traceback
+
 from couchpotato import get_db
 from couchpotato.core.event import fireEvent, addEvent
 from couchpotato.core.helpers.encoding import toUnicode, simplifyString, sp
@@ -10,13 +16,9 @@ from guessit import guess_movie_info
 from scandir import scandir
 from subliminal.videos import Video
 import enzyme
-import os
-import re
-import threading
-import time
-import traceback
 from six.moves import filter, map, zip
 
+
 log = CPLog(__name__)
 
 
diff --git a/couchpotato/core/plugins/score/scores.py b/couchpotato/core/plugins/score/scores.py
index c1f5123..a53608c 100644
--- a/couchpotato/core/plugins/score/scores.py
+++ b/couchpotato/core/plugins/score/scores.py
@@ -1,10 +1,12 @@
+import re
+import traceback
+
 from couchpotato.core.event import fireEvent
 from couchpotato.core.helpers.encoding import simplifyString
 from couchpotato.core.helpers.variable import tryInt
 from couchpotato.core.logger import CPLog
 from couchpotato.environment import Env
-import re
-import traceback
+
 
 log = CPLog(__name__)
 
diff --git a/couchpotato/core/plugins/subtitle.py b/couchpotato/core/plugins/subtitle.py
index 06a77f9..9fd7ef1 100644
--- a/couchpotato/core/plugins/subtitle.py
+++ b/couchpotato/core/plugins/subtitle.py
@@ -1,3 +1,5 @@
+import traceback
+
 from couchpotato.core.event import addEvent
 from couchpotato.core.helpers.encoding import toUnicode, sp
 from couchpotato.core.helpers.variable import splitString
@@ -5,7 +7,7 @@ from couchpotato.core.logger import CPLog
 from couchpotato.core.plugins.base import Plugin
 from couchpotato.environment import Env
 import subliminal
-import traceback
+
 
 log = CPLog(__name__)
 
diff --git a/couchpotato/core/plugins/trailer.py b/couchpotato/core/plugins/trailer.py
index b202e93..ae52586 100644
--- a/couchpotato/core/plugins/trailer.py
+++ b/couchpotato/core/plugins/trailer.py
@@ -1,8 +1,10 @@
+import os
+
 from couchpotato.core.event import addEvent, fireEvent
 from couchpotato.core.helpers.variable import getExt, getTitle
 from couchpotato.core.logger import CPLog
 from couchpotato.core.plugins.base import Plugin
-import os
+
 
 log = CPLog(__name__)
 
diff --git a/couchpotato/core/plugins/userscript/main.py b/couchpotato/core/plugins/userscript/main.py
index 113c035..f857fb9 100644
--- a/couchpotato/core/plugins/userscript/main.py
+++ b/couchpotato/core/plugins/userscript/main.py
@@ -1,3 +1,5 @@
+import os
+
 from couchpotato import index
 from couchpotato.api import addApiView
 from couchpotato.core.event import fireEvent, addEvent
@@ -6,7 +8,7 @@ from couchpotato.core.logger import CPLog
 from couchpotato.core.plugins.base import Plugin
 from couchpotato.environment import Env
 from tornado.web import RequestHandler
-import os
+
 
 log = CPLog(__name__)
 
diff --git a/couchpotato/core/settings.py b/couchpotato/core/settings.py
index da909c7..be2a0d0 100644
--- a/couchpotato/core/settings.py
+++ b/couchpotato/core/settings.py
@@ -1,12 +1,13 @@
 from __future__ import with_statement
 import traceback
+import ConfigParser
+from hashlib import md5
+
 from CodernityDB.hash_index import HashIndex
 from couchpotato.api import addApiView
 from couchpotato.core.event import addEvent, fireEvent
 from couchpotato.core.helpers.encoding import toUnicode
 from couchpotato.core.helpers.variable import mergeDicts, tryInt, tryFloat
-import ConfigParser
-from hashlib import md5
 
 
 class Settings(object):
diff --git a/couchpotato/environment.py b/couchpotato/environment.py
index f7cfd0a..8c1ee17 100644
--- a/couchpotato/environment.py
+++ b/couchpotato/environment.py
@@ -1,8 +1,9 @@
+import os
+
 from couchpotato.core.database import Database
 from couchpotato.core.event import fireEvent, addEvent
 from couchpotato.core.loader import Loader
 from couchpotato.core.settings import Settings
-import os
 
 
 class Env(object):
diff --git a/couchpotato/runner.py b/couchpotato/runner.py
index ba0d97b..d38a786 100644
--- a/couchpotato/runner.py
+++ b/couchpotato/runner.py
@@ -1,15 +1,4 @@
-from CodernityDB.database_thread_safe import ThreadSafeDatabase
-from argparse import ArgumentParser
-from cache import FileSystemCache
-from couchpotato import KeyHandler, LoginHandler, LogoutHandler
-from couchpotato.api import NonBlockHandler, ApiHandler
-from couchpotato.core.event import fireEventAsync, fireEvent
-from couchpotato.core.helpers.encoding import toUnicode
-from couchpotato.core.helpers.variable import getDataDir, tryInt
 from logging import handlers
-from scandir import scandir
-from tornado.httpserver import HTTPServer
-from tornado.web import Application, StaticFileHandler, RedirectHandler
 from uuid import uuid4
 import locale
 import logging
@@ -21,6 +10,18 @@ import warnings
 import re
 import tarfile
 
+from CodernityDB.database_thread_safe import ThreadSafeDatabase
+from argparse import ArgumentParser
+from cache import FileSystemCache
+from couchpotato import KeyHandler, LoginHandler, LogoutHandler
+from couchpotato.api import NonBlockHandler, ApiHandler
+from couchpotato.core.event import fireEventAsync, fireEvent
+from couchpotato.core.helpers.encoding import toUnicode
+from couchpotato.core.helpers.variable import getDataDir, tryInt
+from scandir import scandir
+from tornado.httpserver import HTTPServer
+from tornado.web import Application, StaticFileHandler, RedirectHandler
+
 
 def getOptions(base_path, args):
 
@@ -177,7 +178,6 @@ def runCouchPotato(options, base_path, args, data_dir = None, log_dir = None, En
     logger.addHandler(hdlr2)
 
     # Start logging & enable colors
-    import color_logs
     from couchpotato.core.logger import CPLog
     log = CPLog(__name__)
     log.debug('Started with options %s', options)