diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py
index b0ef8eaf4..69c51f551 100644
--- a/openlp/core/ui/maindisplay.py
+++ b/openlp/core/ui/maindisplay.py
@@ -167,7 +167,7 @@ class DisplayWidget(QtGui.QGraphicsView):
 
     def keyPressEvent(self, event):
         if isinstance(event, QtGui.QKeyEvent):
-            #here accept the event and do something
+            # here accept the event and do something
             if event.key() == QtCore.Qt.Key_Up:
                 Receiver.send_message(u'slidecontroller_live_previous')
                 event.accept()
@@ -233,8 +233,8 @@ class MainDisplay(DisplayWidget):
         self.setupBlank()
         self.blankFrame = None
         self.frame = None
-        #Hide desktop for now until we know where to put it
-        #and what size it should be.
+        # Hide desktop for now until we know where to put it
+        # and what size it should be.
         self.setVisible(False)
 
     def setup(self):
@@ -245,13 +245,12 @@ class MainDisplay(DisplayWidget):
             self.screens, self.screens.monitor_number))
         self.setVisible(False)
         self.screen = self.screens.current
-        #Sort out screen locations and sizes
+        # Sort out screen locations and sizes
         self.setGeometry(self.screen[u'size'])
-        self.scene.setSceneRect(0, 0, self.size().width(),
-            self.size().height())
+        self.scene.setSceneRect(0, 0, self.size().width(), self.size().height())
         self.webView.setGeometry(0, 0, self.size().width(),
             self.size().height())
-        #Build a custom splash screen
+        # Build a custom splash screen.
         self.initialFrame = QtGui.QImage(
             self.screen[u'size'].width(),
             self.screen[u'size'].height(),
@@ -266,7 +265,7 @@ class MainDisplay(DisplayWidget):
             splash_image)
         self.displayImage(self.initialFrame)
         self.repaint()
-        #Build a Black screen
+        # Build a Black screen.
         painter = QtGui.QPainter()
         self.blankFrame = QtGui.QImage(
             self.screen[u'size'].width(),
@@ -274,11 +273,11 @@ class MainDisplay(DisplayWidget):
             QtGui.QImage.Format_ARGB32_Premultiplied)
         painter.begin(self.blankFrame)
         painter.fillRect(self.blankFrame.rect(), QtCore.Qt.black)
-        #build a blank transparent image
+        # Build a blank transparent image.
         self.transparent = QtGui.QPixmap(
             self.screen[u'size'].width(), self.screen[u'size'].height())
         self.transparent.fill(QtCore.Qt.transparent)
-#        self.displayText.setPixmap(self.transparent)
+        #self.displayText.setPixmap(self.transparent)
         #self.frameView(self.transparent)
         # To display or not to display?
         if not self.screen[u'primary']:
@@ -297,13 +296,13 @@ class MainDisplay(DisplayWidget):
         self.webView = QtWebKit.QWebView()
         self.page = self.webView.page()
         self.videoDisplay = self.page.mainFrame()
-        self.videoDisplay.setScrollBarPolicy(QtCore.Qt.Vertical,
+        self.videoDisplay.setScrollBarPolicy(QtCore.Qt.Vertical, 
             QtCore.Qt.ScrollBarAlwaysOff)
-        self.videoDisplay.setScrollBarPolicy(QtCore.Qt.Horizontal,
+        self.videoDisplay.setScrollBarPolicy(QtCore.Qt.Horizontal, 
             QtCore.Qt.ScrollBarAlwaysOff)
         self.proxy = QtGui.QGraphicsProxyWidget()
         self.proxy.setWidget(self.webView)
-        self.proxy.setWindowFlags(QtCore.Qt.Window |
+        self.proxy.setWindowFlags(QtCore.Qt.Window | 
             QtCore.Qt.FramelessWindowHint)
         self.proxy.setZValue(1)
         self.scene.addItem(self.proxy)
@@ -367,7 +366,7 @@ class MainDisplay(DisplayWidget):
         """
         log.debug(u'showDisplay')
         self.displayBlank.setPixmap(self.transparent)
-        #Trigger actions when display is active again
+        # Trigger actions when display is active again.
         Receiver.send_message(u'maindisplay_active')
 
     def addImageWithText(self, frame):
@@ -417,8 +416,7 @@ class MainDisplay(DisplayWidget):
         log.debug(u'adddisplayVideo')
         self.displayImage(self.transparent)
         self.videoDisplay.setHtml(HTMLVIDEO %
-            (path, self.screen[u'size'].width(),
-            self.screen[u'size'].height()))
+            (path, self.screen[u'size'].width(), self.screen[u'size'].height()))
 
     def frameView(self, frame, transition=False):
         """
@@ -506,7 +504,7 @@ class VideoDisplay(Phonon.VideoWidget):
 
     def keyPressEvent(self, event):
         if isinstance(event, QtGui.QKeyEvent):
-            #here accept the event and do something
+            # here accept the event and do something
             if event.key() == QtCore.Qt.Key_Escape:
                 self.onMediaStop()
                 event.accept()
@@ -521,7 +519,7 @@ class VideoDisplay(Phonon.VideoWidget):
         log.debug(u'VideoDisplay Setup %s for %s ' % (self.screens,
             self.screens.monitor_number))
         self.screen = self.screens.current
-        #Sort out screen locations and sizes
+        # Sort out screen locations and sizes.
         self.setGeometry(self.screen[u'size'])
         # To display or not to display?
         if not self.screen[u'primary']: # and self.isVisible():