diff --git a/mopidy_touchscreen/__init__.py b/mopidy_touchscreen/__init__.py
index f58aa0c..0c7437e 100644
--- a/mopidy_touchscreen/__init__.py
+++ b/mopidy_touchscreen/__init__.py
@@ -1,5 +1,4 @@
 from __future__ import unicode_literals
-import logging
 import os
 
 from mopidy import config, ext
diff --git a/mopidy_touchscreen/gpio_inpput_manager.py b/mopidy_touchscreen/gpio_inpput_manager.py
index 21adc61..1036c54 100644
--- a/mopidy_touchscreen/gpio_inpput_manager.py
+++ b/mopidy_touchscreen/gpio_inpput_manager.py
@@ -1,6 +1,7 @@
 import logging
 
 import RPi.GPIO as GPIO
+
 import pygame
 
 
diff --git a/mopidy_touchscreen/main_screen.py b/mopidy_touchscreen/main_screen.py
index 58e4e9a..bf46f86 100644
--- a/mopidy_touchscreen/main_screen.py
+++ b/mopidy_touchscreen/main_screen.py
@@ -3,12 +3,14 @@ import json
 import logging
 import os
 import time
-import mopidy.core
 import urllib
 import urllib2
 from threading import Thread
+
 import pygame
 
+import mopidy.core
+
 from .base_screen import BaseScreen
 from .input_manager import InputManager
 from .screen_objects import (Progressbar, ScreenObjectsManager,
diff --git a/mopidy_touchscreen/menu_screen.py b/mopidy_touchscreen/menu_screen.py
index 144cbf6..ff67bf8 100644
--- a/mopidy_touchscreen/menu_screen.py
+++ b/mopidy_touchscreen/menu_screen.py
@@ -1,5 +1,6 @@
 import os
 import socket
+
 import mopidy
 
 from .base_screen import BaseScreen
diff --git a/mopidy_touchscreen/playlist_screen.py b/mopidy_touchscreen/playlist_screen.py
index dda4b97..a14bc04 100644
--- a/mopidy_touchscreen/playlist_screen.py
+++ b/mopidy_touchscreen/playlist_screen.py
@@ -1,5 +1,5 @@
-from .list_view import ListView
 from .base_screen import BaseScreen
+from .list_view import ListView
 
 
 class PlaylistScreen(BaseScreen):
diff --git a/mopidy_touchscreen/screen_manager.py b/mopidy_touchscreen/screen_manager.py
index 0a3d090..1cb956e 100644
--- a/mopidy_touchscreen/screen_manager.py
+++ b/mopidy_touchscreen/screen_manager.py
@@ -1,17 +1,19 @@
 import logging
 import traceback
-import pygame
 from pkg_resources import Requirement, resource_filename
 
+import pygame
+
 from .dynamic_background import DynamicBackground
 from .input_manager import InputManager
 from .library_screen import LibraryScreen
 from .main_screen import MainScreen
 from .menu_screen import MenuScreen
 from .playlist_screen import PlaylistScreen
-from .search_screen import SearchScreen
 from .screen_objects import ScreenObjectsManager, \
     TouchAndTextItem
+from .search_screen import SearchScreen
+
 
 from .tracklist import Tracklist
 
diff --git a/mopidy_touchscreen/screen_objects.py b/mopidy_touchscreen/screen_objects.py
index 1e35cc7..c9bee59 100644
--- a/mopidy_touchscreen/screen_objects.py
+++ b/mopidy_touchscreen/screen_objects.py
@@ -3,8 +3,6 @@ import math
 
 import pygame
 
-from .input_manager import InputManager
-
 
 logger = logging.getLogger(__name__)
 
@@ -146,7 +144,8 @@ class TextItem(BaseItem):
     def render(self, surface):
         if self.fit_horizontal:
             surface.blit(
-                self.box, ((self.pos[0] + self.margin), self.pos[1]), area=self.rect)
+                self.box, ((self.pos[0] + self.margin),
+                           self.pos[1]), area=self.rect)
         else:
             surface.blit(self.box, self.pos,
                          area=pygame.Rect(self.step, 0, self.size[0],
diff --git a/mopidy_touchscreen/search_screen.py b/mopidy_touchscreen/search_screen.py
index 991268a..9c5129b 100644
--- a/mopidy_touchscreen/search_screen.py
+++ b/mopidy_touchscreen/search_screen.py
@@ -1,11 +1,10 @@
-from .list_view import ListView
-
 import pygame
 
 from .base_screen import BaseScreen
 from .input_manager import InputManager
+from .list_view import ListView
 from .screen_objects import ScreenObjectsManager, \
-    TouchAndTextItem, TextItem
+    TextItem, TouchAndTextItem
 
 
 mode_track_name = 0
diff --git a/mopidy_touchscreen/touch_screen.py b/mopidy_touchscreen/touch_screen.py
index ad87655..3652294 100644
--- a/mopidy_touchscreen/touch_screen.py
+++ b/mopidy_touchscreen/touch_screen.py
@@ -1,10 +1,11 @@
 import logging
 import os
-from threading import Thread
 import traceback
+from threading import Thread
 
 import pygame
 import pykka
+
 import mopidy
 from mopidy import core
 
@@ -43,6 +44,7 @@ class TouchScreen(pykka.ThreadingActor, core.CoreListener):
         # Raspberry pi GPIO
         self.gpio = config['touchscreen']['gpio']
         if self.gpio:
+
             from .gpio_inpput_manager import GPIOManager
 
             pins = {}