diff --git a/openlp/core/ui/__init__.py b/openlp/core/ui/__init__.py
index 26c59ed0f..ca2123c87 100644
--- a/openlp/core/ui/__init__.py
+++ b/openlp/core/ui/__init__.py
@@ -35,11 +35,11 @@ class HideMode(object):
     ``Blank``
         This mode is used to hide all output, specifically by covering the
         display with a black screen.
-        
+  
     ``Theme``
         This mode is used to hide all output, but covers the display with the
         current theme background, as opposed to black.
-        
+  
     ``Desktop``
         This mode hides all output by minimising the display, leaving the user's
         desktop showing.
diff --git a/openlp/plugins/bibles/forms/bibleimportwizard.py b/openlp/plugins/bibles/forms/bibleimportwizard.py
index a85e430a1..3200bf974 100644
--- a/openlp/plugins/bibles/forms/bibleimportwizard.py
+++ b/openlp/plugins/bibles/forms/bibleimportwizard.py
@@ -234,7 +234,7 @@ class Ui_BibleImportWizard(object):
             QtGui.QSizePolicy.Minimum)
         self.openlp1Layout.setItem(1, QtGui.QFormLayout.LabelRole,
             self.openlp1Spacer)
-        self.selectStack.addWidget(self.openlp1Widget) 
+        self.selectStack.addWidget(self.openlp1Widget)
         self.selectPageLayout.addLayout(self.selectStack)
         bibleImportWizard.addPage(self.selectPage)
         # License Page
diff --git a/openlp/plugins/songs/forms/authorsdialog.py b/openlp/plugins/songs/forms/authorsdialog.py
index 28083ae05..6f1c7f2a4 100644
--- a/openlp/plugins/songs/forms/authorsdialog.py
+++ b/openlp/plugins/songs/forms/authorsdialog.py
@@ -54,7 +54,7 @@ class Ui_AuthorsDialog(object):
         self.displayEdit.setObjectName(u'displayEdit')
         self.displayLabel.setBuddy(self.displayEdit)
         self.authorLayout.addRow(self.displayLabel, self.displayEdit)
-        self.dialogLayout.addLayout(self.authorLayout) 
+        self.dialogLayout.addLayout(self.authorLayout)
         self.buttonBox = QtGui.QDialogButtonBox(authorsDialog)
         self.buttonBox.setStandardButtons(
             QtGui.QDialogButtonBox.Save | QtGui.QDialogButtonBox.Cancel)
diff --git a/openlp/plugins/songs/forms/songimportwizard.py b/openlp/plugins/songs/forms/songimportwizard.py
index 6eccff9b4..903300d0c 100644
--- a/openlp/plugins/songs/forms/songimportwizard.py
+++ b/openlp/plugins/songs/forms/songimportwizard.py
@@ -39,7 +39,7 @@ class Ui_SongImportWizard(object):
             QtGui.QWizard.IndependentPages |
             QtGui.QWizard.NoBackButtonOnStartPage |
             QtGui.QWizard.NoBackButtonOnLastPage)
-        # Welcome Page 
+        # Welcome Page
         self.welcomePage = QtGui.QWizardPage()
         self.welcomePage.setPixmap(QtGui.QWizard.WatermarkPixmap,
             QtGui.QPixmap(u':/wizards/wizard_importsong.bmp'))
diff --git a/openlp/plugins/songs/lib/xml.py b/openlp/plugins/songs/lib/xml.py
index a5c8ecd06..10d93b100 100644
--- a/openlp/plugins/songs/lib/xml.py
+++ b/openlp/plugins/songs/lib/xml.py
@@ -359,10 +359,10 @@ class OpenLyricsParser(object):
         OpenLP does not support the attribute *type* and *lang*.
 
     *<chord>*
-        This property is not supported. 
+        This property is not supported.
 
     *<comments>*
-        The *<comments>* property  is fully supported. But comments in lyrics
+        The *<comments>* property is fully supported. But comments in lyrics
         are not supported.
 
     *<copyright>*
@@ -372,23 +372,23 @@ class OpenLyricsParser(object):
         This property is not supported.
 
     *<key>*
-        This property is not supported. 
+        This property is not supported.
 
     *<keywords>*
-        This property is not supported. 
+        This property is not supported.
 
     *<lines>*
         The attribute *part* is not supported.
 
     *<publisher>*
-        This property is not supported. 
+        This property is not supported.
 
     *<songbooks>*
         As OpenLP does only support one songbook, we cannot consider more than
         one songbook.
 
     *<tempo>*
-        This property is not supported. 
+        This property is not supported.
 
     *<themes>*
         Topics, as they are called in OpenLP, are fully supported, whereby only
@@ -399,9 +399,9 @@ class OpenLyricsParser(object):
         This property is not supported.
 
     *<variant>*
-        This property is not supported. 
+        This property is not supported.
 
-    *<verse name="v1a"  lang="he" translit="en">*
+    *<verse name="v1a" lang="he" translit="en">*
         The attribute *translit* and *lang* are not supported.
 
     *<verseOrder>*