diff --git a/openlp/core/lib/mediamanageritem.py b/openlp/core/lib/mediamanageritem.py
index 0f4018c34..a6d62f618 100644
--- a/openlp/core/lib/mediamanageritem.py
+++ b/openlp/core/lib/mediamanageritem.py
@@ -244,7 +244,8 @@ class MediaManagerItem(QtGui.QWidget):
             self.addToolbarButton(
                 unicode(translate('OpenLP.MediaManagerItem', 'Delete %s')) %
                 self.PluginNameShort,
-                translate('OpenLP.MediaManagerItem', 'Delete the selected item'),
+                translate('OpenLP.MediaManagerItem',
+                    'Delete the selected item'),
                 u':/general/general_delete.png', self.onDeleteClick)
         ## Separator Line ##
         self.addToolbarSeparator()
@@ -297,7 +298,8 @@ class MediaManagerItem(QtGui.QWidget):
             self.listView.addAction(
                 context_menu_action(
                     self.listView, u':/general/general_delete.png',
-                    unicode(translate('OpenLP.MediaManagerItem', '&Delete %s')) %
+                    unicode(translate('OpenLP.MediaManagerItem',
+                        '&Delete %s')) %
                     self.pluginNameVisible,
                     self.onDeleteClick))
             self.listView.addAction(context_menu_separator(self.listView))
@@ -509,7 +511,8 @@ class MediaManagerItem(QtGui.QWidget):
             service_item = self.parent.serviceManager.getServiceItem()
             if not service_item:
                 QtGui.QMessageBox.information(self,
-                    translate('OpenLP.MediaManagerItem', 'No Service Item Selected'),
+                    translate('OpenLP.MediaManagerItem',
+                        'No Service Item Selected'),
                     translate('OpenLP.MediaManagerItem',
                         'You must select an existing service item to add to.'))
             elif self.title.lower() == service_item.name.lower():
@@ -519,7 +522,8 @@ class MediaManagerItem(QtGui.QWidget):
             else:
                 #Turn off the remote edit update message indicator
                 QtGui.QMessageBox.information(self,
-                    translate('OpenLP.MediaManagerItem', 'Invalid Service Item'),
+                    translate('OpenLP.MediaManagerItem',
+                        'Invalid Service Item'),
                     unicode(translate('OpenLP.MediaManagerItem',
                         'You must select a %s service item.')) % self.title)
 
@@ -535,4 +539,4 @@ class MediaManagerItem(QtGui.QWidget):
         if self.generateSlideData(service_item, item):
             return service_item
         else:
-            return None
\ No newline at end of file
+            return None
diff --git a/openlp/core/ui/aboutdialog.py b/openlp/core/ui/aboutdialog.py
index bc6a15a1f..3965b4ffc 100644
--- a/openlp/core/ui/aboutdialog.py
+++ b/openlp/core/ui/aboutdialog.py
@@ -562,5 +562,6 @@ class Ui_AboutDialog(object):
         self.aboutNotebook.setTabText(
             self.aboutNotebook.indexOf(self.licenseTab),
             translate('OpenLP.AboutForm', 'License'))
-        self.contributeButton.setText(translate('OpenLP.AboutForm', 'Contribute'))
+        self.contributeButton.setText(translate('OpenLP.AboutForm',
+            'Contribute'))
         self.closeButton.setText(translate('OpenLP.AboutForm', 'Close'))
diff --git a/openlp/core/ui/advancedtab.py b/openlp/core/ui/advancedtab.py
index 08450b787..0a12c54e5 100644
--- a/openlp/core/ui/advancedtab.py
+++ b/openlp/core/ui/advancedtab.py
@@ -134,7 +134,8 @@ class AdvancedTab(SettingsTab):
         """
         self.uiGroupBox.setTitle(translate('OpenLP.AdvancedTab', 'UI Settings'))
         self.recentLabel.setText(
-            translate('OpenLP.AdvancedTab', 'Number of recent files to display:'))
+            translate('OpenLP.AdvancedTab',
+                'Number of recent files to display:'))
         self.mediaPluginCheckBox.setText(translate('OpenLP.AdvancedTab',
             'Remember active media manager tab on startup'))
         self.doubleClickLiveCheckBox.setText(translate('OpenLP.AdvancedTab',
@@ -188,4 +189,4 @@ class AdvancedTab(SettingsTab):
         """
         self.sharedLabel.setEnabled(checked)
         self.sharedTextEdit.setEnabled(checked)
-        self.sharedPushButton.setEnabled(checked)
\ No newline at end of file
+        self.sharedPushButton.setEnabled(checked)
diff --git a/openlp/core/ui/amendthemeform.py b/openlp/core/ui/amendthemeform.py
index 36bbcaba3..2776b3f7b 100644
--- a/openlp/core/ui/amendthemeform.py
+++ b/openlp/core/ui/amendthemeform.py
@@ -222,7 +222,8 @@ class AmendThemeForm(QtGui.QDialog, Ui_AmendThemeDialog):
         images_filter = '%s;;%s (*.*) (*)' % (images_filter,
             translate('OpenLP.AmendThemeForm', 'All Files'))
         filename = QtGui.QFileDialog.getOpenFileName(self,
-            translate('OpenLP.AmendThemeForm', 'Select Image'), u'', images_filter)
+            translate('OpenLP.AmendThemeForm', 'Select Image'), u'',
+            images_filter)
         if filename:
             self.ImageLineEdit.setText(filename)
             self.theme.background_filename = filename
@@ -765,4 +766,4 @@ class AmendThemeForm(QtGui.QDialog, Ui_AmendThemeDialog):
         if self.theme.font_main_width < metrics.maxWidth() * 2 + 64:
             self.theme.font_main_width = metrics.maxWidth() * 2 + 64
             self.FontMainWidthSpinBox.setValue(self.theme.font_main_width)
-        return metrics
\ No newline at end of file
+        return metrics
diff --git a/openlp/core/ui/generaltab.py b/openlp/core/ui/generaltab.py
index a851ef67f..68b717c4d 100644
--- a/openlp/core/ui/generaltab.py
+++ b/openlp/core/ui/generaltab.py
@@ -287,7 +287,8 @@ class GeneralTab(SettingsTab):
         """
         Translate the general settings tab to the currently selected language
         """
-        self.MonitorGroupBox.setTitle(translate('OpenLP.GeneralTab', 'Monitors'))
+        self.MonitorGroupBox.setTitle(translate('OpenLP.GeneralTab',
+            'Monitors'))
         self.MonitorLabel.setText(translate('OpenLP.GeneralTab',
             'Select monitor for output display:'))
         self.DisplayOnMonitorCheck.setText(
@@ -473,4 +474,4 @@ class GeneralTab(SettingsTab):
         self.customYValueEdit.setEnabled(checked)
         self.customHeightValueEdit.setEnabled(checked)
         self.customWidthValueEdit.setEnabled(checked)
-        self.override_changed = True
\ No newline at end of file
+        self.override_changed = True
diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py
index ee6336a93..853026d35 100644
--- a/openlp/core/ui/maindisplay.py
+++ b/openlp/core/ui/maindisplay.py
@@ -92,12 +92,12 @@ class DisplayManager(QtGui.QWidget):
         self.videoDisplay.mediaHide(message)
         self.mainDisplay.hideDisplay(message)
 
-    def showDisplay(self, message):
+    def showDisplay(self):
         """
         Hide the output displays
         """
-        self.videoDisplay.mediaShow(message)
-        self.mainDisplay.showDisplay(message)
+        self.videoDisplay.mediaShow()
+        self.mainDisplay.showDisplay()
 
     def addAlert(self, alertMessage, location):
         """
@@ -623,7 +623,7 @@ class VideoDisplay(Phonon.VideoWidget):
         self.hidden = True
         self.setVisible(False)
 
-    def mediaShow(self, message=''):
+    def mediaShow(self):
         """
         Show the video display if it was already hidden
         """
diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py
index 5961c26ab..cbbe7f5bd 100644
--- a/openlp/core/ui/mainwindow.py
+++ b/openlp/core/ui/mainwindow.py
@@ -498,7 +498,8 @@ class Ui_MainWindow(object):
         self.HelpAboutItem.setText(translate('OpenLP.MainWindow', '&About'))
         self.HelpAboutItem.setStatusTip(
             translate('OpenLP.MainWindow', 'More information about OpenLP'))
-        self.HelpAboutItem.setShortcut(translate('OpenLP.MainWindow', 'Ctrl+F1'))
+        self.HelpAboutItem.setShortcut(translate('OpenLP.MainWindow',
+            'Ctrl+F1'))
         self.HelpOnlineHelpItem.setText(
             translate('OpenLP.MainWindow', '&Online Help'))
         self.HelpWebSiteItem.setText(
@@ -707,7 +708,8 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
         version_text = unicode(translate('OpenLP.MainWindow',
             'Version %s of OpenLP is now available for download (you are '
             'currently running version %s). \n\nYou can download the latest '
-            'version from <a href="http://openlp.org/">http://openlp.org/</a>.'))
+            'version from '
+            '<a href="http://openlp.org/">http://openlp.org/</a>.'))
         QtGui.QMessageBox.question(self,
             translate('OpenLP.MainWindow', 'OpenLP Version Updated'),
             version_text % (version, app_version),
@@ -893,7 +895,8 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
 
     def defaultThemeChanged(self, theme):
         self.DefaultThemeLabel.setText(
-            unicode(translate('OpenLP.MainWindow', 'Default Theme: %s')) % theme)
+            unicode(translate('OpenLP.MainWindow', 'Default Theme: %s')) %
+                theme)
 
     def toggleMediaManager(self, visible):
         if self.MediaManagerDock.isVisible() != visible:
@@ -1016,4 +1019,4 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
             self.recentFiles.insert(0, QtCore.QString(filename))
             while self.recentFiles.count() > maxRecentFiles:
                 # Don't care what API says takeLast works, removeLast doesn't!
-                self.recentFiles.takeLast()
\ No newline at end of file
+                self.recentFiles.takeLast()
diff --git a/openlp/core/ui/serviceitemeditdialog.py b/openlp/core/ui/serviceitemeditdialog.py
index 5a85d42bc..c3ccbfaaf 100644
--- a/openlp/core/ui/serviceitemeditdialog.py
+++ b/openlp/core/ui/serviceitemeditdialog.py
@@ -71,5 +71,6 @@ class Ui_ServiceItemEditDialog(object):
         ServiceItemEditDialog.setWindowTitle(
             translate('OpenLP.ServiceItemEditForm', 'Reorder Service Item'))
         self.upButton.setText(translate('OpenLP.ServiceItemEditForm', 'Up'))
-        self.deleteButton.setText(translate('OpenLP.ServiceItemEditForm', 'Delete'))
+        self.deleteButton.setText(translate('OpenLP.ServiceItemEditForm',
+            'Delete'))
         self.downButton.setText(translate('OpenLP.ServiceItemEditForm', 'Down'))
diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py
index 7fb96bf6e..a9f7af20c 100644
--- a/openlp/core/ui/servicemanager.py
+++ b/openlp/core/ui/servicemanager.py
@@ -133,8 +133,8 @@ class ServiceManager(QtGui.QWidget):
             translate('OpenLP.ServiceManager', 'Save this service'),
             self.onQuickSaveService)
         self.Toolbar.addSeparator()
-        self.ThemeLabel = QtGui.QLabel(translate('OpenLP.ServiceManager', 'Theme:'),
-            self)
+        self.ThemeLabel = QtGui.QLabel(translate('OpenLP.ServiceManager',
+            'Theme:'), self)
         self.ThemeLabel.setMargin(3)
         self.Toolbar.addToolbarWidget(u'ThemeLabel', self.ThemeLabel)
         self.ThemeComboBox = QtGui.QComboBox(self.Toolbar)
@@ -846,8 +846,8 @@ class ServiceManager(QtGui.QWidget):
         else:
             QtGui.QMessageBox.critical(self,
                 translate('OpenLP.ServiceManager', 'Missing Display Handler'),
-                translate('OpenLP.ServiceManager', 'Your item cannot be displayed '
-                    'as there is no handler to display it'),
+                translate('OpenLP.ServiceManager', 'Your item cannot be '
+                    'displayed as there is no handler to display it'),
                 QtGui.QMessageBox.StandardButtons(
                     QtGui.QMessageBox.Ok),
                 QtGui.QMessageBox.Ok)
@@ -882,8 +882,8 @@ class ServiceManager(QtGui.QWidget):
         else:
             QtGui.QMessageBox.critical(self,
                 translate('OpenLP.ServiceManager', 'Missing Display Handler'),
-                translate('OpenLP.ServiceManager', 'Your item cannot be displayed '
-                    'as there is no handler to display it'),
+                translate('OpenLP.ServiceManager', 'Your item cannot be '
+                    'displayed as there is no handler to display it'),
                 QtGui.QMessageBox.StandardButtons(
                     QtGui.QMessageBox.Ok),
                 QtGui.QMessageBox.Ok)
@@ -1031,4 +1031,4 @@ class ServiceManager(QtGui.QWidget):
             data_item[u'notes'] = unicode(service_item.notes)
             data_item[u'selected'] = (item == curitem)
             data.append(data_item)
-        Receiver.send_message(u'servicemanager_list_response', data)
\ No newline at end of file
+        Receiver.send_message(u'servicemanager_list_response', data)
diff --git a/openlp/plugins/bibles/lib/common.py b/openlp/plugins/bibles/lib/common.py
index cf7d9727a..5308495a3 100644
--- a/openlp/plugins/bibles/lib/common.py
+++ b/openlp/plugins/bibles/lib/common.py
@@ -64,7 +64,7 @@ def parse_reference(reference):
         to_verse = match.group(5)
         if int(match.group(2)) == int(match.group(4)):
             reference_list.append(
-                (match.group(1), int(match.group(2)), from_verse, to_verse)
+                (book, int(match.group(2)), from_verse, to_verse)
             )
         else:
             if int(match.group(2)) > int(match.group(4)):
@@ -75,17 +75,11 @@ def parse_reference(reference):
                 to_chapter = int(match.group(4))
             for chapter in xrange(from_chapter, to_chapter + 1):
                 if chapter == from_chapter:
-                    reference_list.append(
-                        (match.group(1), chapter, from_verse, -1)
-                    )
+                    reference_list.append((book, chapter, from_verse, -1))
                 elif chapter == to_chapter:
-                    reference_list.append(
-                        (match.group(1), chapter, 1, to_verse)
-                    )
+                    reference_list.append((book, chapter, 1, to_verse))
                 else:
-                    reference_list.append(
-                        (match.group(1), chapter, 1, -1)
-                    )
+                    reference_list.append((book, chapter, 1, -1))
     else:
         match = only_verses.match(reference)
         if match:
diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py
index be044b22a..5d6984231 100644
--- a/openlp/plugins/bibles/lib/mediaitem.py
+++ b/openlp/plugins/bibles/lib/mediaitem.py
@@ -519,7 +519,7 @@ class BibleMediaItem(MediaManagerItem):
             #permission = self._decodeQtObject(reference, 'permission')
             if self.parent.settings_tab.display_style == 1:
                 verse_text = self.formatVerse(old_chapter, chapter, verse,
-                    u'(u', u')')
+                    u'(', u')')
             elif self.parent.settings_tab.display_style == 2:
                 verse_text = self.formatVerse(old_chapter, chapter, verse,
                     u'{', u'}')
@@ -659,4 +659,4 @@ class BibleMediaItem(MediaManagerItem):
 
     def searchByReference(self, bible, search):
         log.debug(u'searchByReference %s, %s', bible, search)
-        self.search_results = self.parent.manager.get_verses(bible, search)
\ No newline at end of file
+        self.search_results = self.parent.manager.get_verses(bible, search)
diff --git a/openlp/plugins/presentations/lib/mediaitem.py b/openlp/plugins/presentations/lib/mediaitem.py
index e7cdfedba..0b84313b8 100644
--- a/openlp/plugins/presentations/lib/mediaitem.py
+++ b/openlp/plugins/presentations/lib/mediaitem.py
@@ -164,7 +164,7 @@ class PresentationMediaItem(MediaManagerItem):
             self.DisplayTypeComboBox.insertItem(0, self.Automatic)
             self.DisplayTypeComboBox.setCurrentIndex(0)
         if QtCore.QSettings().value(self.settingsSection + u'/override app', 
-            QtCore.QVariant(QtCore.Qt.Unchecked)) == QtCore.Qt.Checked:          
+            QtCore.QVariant(QtCore.Qt.Unchecked)) == QtCore.Qt.Checked:
             self.PresentationWidget.show()
         else:
             self.PresentationWidget.hide()
@@ -299,4 +299,4 @@ class PresentationMediaItem(MediaManagerItem):
             if self.controllers[controller].enabled():
                 if filetype in self.controllers[controller].alsosupports:
                     return controller
-        return None
\ No newline at end of file
+        return None
diff --git a/openlp/plugins/presentations/lib/pptviewcontroller.py b/openlp/plugins/presentations/lib/pptviewcontroller.py
index cec430ce3..e1a1c9daa 100644
--- a/openlp/plugins/presentations/lib/pptviewcontroller.py
+++ b/openlp/plugins/presentations/lib/pptviewcontroller.py
@@ -150,7 +150,8 @@ class PptviewDocument(PresentationDocument):
         if self.check_thumbnails():
             return
         for idx in range(self.get_slide_count()):
-            path = u'%s\\slide%s.bmp' % (self.get_temp_folder(), unicode(idx + 1))            
+            path = u'%s\\slide%s.bmp' % (self.get_temp_folder(),
+                unicode(idx + 1))
             self.convert_thumbnail(path, idx + 1)
 
     def close_presentation(self):
@@ -246,4 +247,4 @@ class PptviewDocument(PresentationDocument):
         """
         Triggers the previous slide on the running presentation
         """
-        self.controller.process.PrevStep(self.pptid)
\ No newline at end of file
+        self.controller.process.PrevStep(self.pptid)
diff --git a/openlp/plugins/remotes/lib/remotetab.py b/openlp/plugins/remotes/lib/remotetab.py
index 9c7935521..ad1f4aac5 100644
--- a/openlp/plugins/remotes/lib/remotetab.py
+++ b/openlp/plugins/remotes/lib/remotetab.py
@@ -44,7 +44,8 @@ class RemoteTab(SettingsTab):
         self.remoteLayout.setObjectName(u'remoteLayout')
         self.serverSettingsGroupBox = QtGui.QGroupBox(self)
         self.serverSettingsGroupBox.setObjectName(u'serverSettingsGroupBox')
-        self.serverSettingsLayout = QtGui.QFormLayout(self.serverSettingsGroupBox)
+        self.serverSettingsLayout = QtGui.QFormLayout(
+            self.serverSettingsGroupBox)
         self.serverSettingsLayout.setSpacing(8)
         self.serverSettingsLayout.setMargin(8)
         self.serverSettingsLayout.setObjectName(u'serverSettingsLayout')
@@ -78,4 +79,4 @@ class RemoteTab(SettingsTab):
         QtCore.QSettings().setValue(self.settingsSection + u'/port',
             QtCore.QVariant(self.portSpinBox.value()))
         QtCore.QSettings().setValue(self.settingsSection + u'/ip address',
-            QtCore.QVariant(self.addressEdit.text()))
\ No newline at end of file
+            QtCore.QVariant(self.addressEdit.text()))