diff --git a/openlp/core/lib/imagemanager.py b/openlp/core/lib/imagemanager.py
index 02d7010be..fb242602a 100644
--- a/openlp/core/lib/imagemanager.py
+++ b/openlp/core/lib/imagemanager.py
@@ -61,10 +61,10 @@ class Image(object):
     image = None
     image_bytes = None
 
+
 class ImageManager(QtCore.QObject):
     """
     Image Manager handles the conversion and sizing of images.
-
     """
     log.info(u'Image Manager loaded')
 
diff --git a/openlp/core/lib/plugin.py b/openlp/core/lib/plugin.py
index fb31006b5..476df79b0 100644
--- a/openlp/core/lib/plugin.py
+++ b/openlp/core/lib/plugin.py
@@ -44,6 +44,9 @@ class PluginStatus(object):
 
 
 class StringContent(object):
+    """
+    Provide standard strings for objects to use.
+    """
     Name = u'name'
     Import = u'import'
     Load = u'load'
diff --git a/openlp/core/ui/displaytagtab.py b/openlp/core/ui/displaytagtab.py
index 983bc17a8..54d021913 100644
--- a/openlp/core/ui/displaytagtab.py
+++ b/openlp/core/ui/displaytagtab.py
@@ -23,27 +23,27 @@
 # with this program; if not, write to the Free Software Foundation, Inc., 59  #
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
-'''
+"""
 The :mod:`DisplayTagTab` provides an Tag Edit facility.  The Base set are
 protected and included each time loaded.  Custom tags can be defined and saved.
 The Custom Tag arrays are saved in a pickle so QSettings works on them.  Base
 Tags cannot be changed.
-
-'''
+"""
 import cPickle
+
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import SettingsTab, translate, DisplayTags
 from openlp.core.lib.ui import critical_error_message_box
 
 class DisplayTagTab(SettingsTab):
-    '''
+    """
     The :class:`DisplayTagTab` manages the settings tab .
-    '''
+    """
     def __init__(self):
-        '''
+        """
         Initialise the settings tab
-        '''
+        """
         SettingsTab.__init__(self, u'Display Tags')
 
     def resizeEvent(self, event=None):
@@ -67,9 +67,9 @@ class DisplayTagTab(SettingsTab):
         self.selected = -1
 
     def setupUi(self):
-        '''
+        """
         Configure the UI elements for the tab.
-        '''
+        """
         self.setObjectName(u'DisplayTagTab')
         self.tabTitleVisible = \
             translate(u'OpenLP.DisplayTagTab', 'Display Tags')
diff --git a/openlp/core/ui/pluginform.py b/openlp/core/ui/pluginform.py
index 3b41d76a3..6318a44a5 100644
--- a/openlp/core/ui/pluginform.py
+++ b/openlp/core/ui/pluginform.py
@@ -34,7 +34,9 @@ from plugindialog import Ui_PluginViewDialog
 log = logging.getLogger(__name__)
 
 class PluginForm(QtGui.QDialog, Ui_PluginViewDialog):
-
+    """
+    The plugin form provides user control over the plugins OpenLP uses.
+    """
     def __init__(self, parent=None):
         QtGui.QDialog.__init__(self, parent)
         self.parent = parent
diff --git a/openlp/plugins/songs/lib/db.py b/openlp/plugins/songs/lib/db.py
index 2bbf818b3..d9a3202b5 100644
--- a/openlp/plugins/songs/lib/db.py
+++ b/openlp/plugins/songs/lib/db.py
@@ -71,7 +71,6 @@ class Topic(BaseModel):
 
 
 def init_schema(url):
-
     """
     Setup the songs database connection and initialise the database schema.
 
diff --git a/openlp/plugins/songs/lib/opensongimport.py b/openlp/plugins/songs/lib/opensongimport.py
index eb16f4ba4..e7557f952 100644
--- a/openlp/plugins/songs/lib/opensongimport.py
+++ b/openlp/plugins/songs/lib/opensongimport.py
@@ -36,9 +36,6 @@ from openlp.plugins.songs.lib.songimport import SongImport
 
 log = logging.getLogger(__name__)
 
-class OpenSongImportError(Exception):
-    pass
-
 class OpenSongImport(SongImport):
     """
     Import songs exported from OpenSong