diff --git a/openlp/core/lib/db.py b/openlp/core/lib/db.py
index f6a7fdaad..c92f992c8 100644
--- a/openlp/core/lib/db.py
+++ b/openlp/core/lib/db.py
@@ -91,6 +91,7 @@ class BaseModel(object):
             instance.__setattr__(key, kwargs[key])
         return instance
 
+
 class Manager(object):
     """
     Provide generic object persistence management
diff --git a/openlp/core/lib/theme.py b/openlp/core/lib/theme.py
index 6f97c0608..ef26ca842 100644
--- a/openlp/core/lib/theme.py
+++ b/openlp/core/lib/theme.py
@@ -91,6 +91,7 @@ class ThemeLevel(object):
     Service = 2
     Song = 3
 
+
 class BackgroundType(object):
     """
     Type enumeration for backgrounds.
@@ -123,6 +124,7 @@ class BackgroundType(object):
         elif type_string == u'image':
             return BackgroundType.Image
 
+
 class BackgroundGradientType(object):
     """
     Type enumeration for background gradients.
@@ -200,6 +202,7 @@ INTEGER_LIST = [u'size', u'line_adjustment', u'x', u'height', u'y',
     u'width', u'shadow_size', u'outline_size', u'horizontal_align',
     u'vertical_align', u'wrap_style']
 
+
 class ThemeXML(object):
     """
     A class to encapsulate the Theme XML.
diff --git a/openlp/plugins/presentations/lib/messagelistener.py b/openlp/plugins/presentations/lib/messagelistener.py
index cf43566ae..4db78f7a5 100644
--- a/openlp/plugins/presentations/lib/messagelistener.py
+++ b/openlp/plugins/presentations/lib/messagelistener.py
@@ -213,6 +213,7 @@ class Controller(object):
     def poll(self):
         self.doc.poll_slidenumber(self.is_live)
 
+
 class MessageListener(object):
     """
     This is the Presentation listener who acts on events from the slide
diff --git a/openlp/plugins/songs/lib/ewimport.py b/openlp/plugins/songs/lib/ewimport.py
index 1f4ded5bd..880c7f547 100644
--- a/openlp/plugins/songs/lib/ewimport.py
+++ b/openlp/plugins/songs/lib/ewimport.py
@@ -129,6 +129,7 @@ class FieldDescEntry:
         self.type = type
         self.size = size
 
+
 class EasyWorshipSongImport(SongImport):
     """
     The :class:`EasyWorshipSongImport` class provides OpenLP with the
diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py
index d9e9b3063..d29e18c1d 100644
--- a/openlp/plugins/songs/lib/mediaitem.py
+++ b/openlp/plugins/songs/lib/mediaitem.py
@@ -53,6 +53,7 @@ class SongSearch(object):
     Authors = 4
     Themes = 5
 
+
 class SongMediaItem(MediaManagerItem):
     """
     This is the custom media manager item for Songs.
diff --git a/openlp/plugins/songs/lib/opensongimport.py b/openlp/plugins/songs/lib/opensongimport.py
index 8fddf5e4f..4da1234a5 100644
--- a/openlp/plugins/songs/lib/opensongimport.py
+++ b/openlp/plugins/songs/lib/opensongimport.py
@@ -36,7 +36,6 @@ from openlp.plugins.songs.lib.songimport import SongImport
 
 log = logging.getLogger(__name__)
 
-#TODO: Use lxml for parsing and make sure we use methods of "SongImport" .
 class OpenSongImport(SongImport):
     """
     Import songs exported from OpenSong