diff --git a/TVEncoder.py b/TVEncoder.py
index c822a84..142ad62 100644
--- a/TVEncoder.py
+++ b/TVEncoder.py
@@ -12,49 +12,52 @@ from libsettings import Settings
 from libhandbrake import Encoder
 from libtvdatasource import TVData
 
-#TVRECORDINGSDIR = "/Volumes/TV Recordings/"
-#TVRECORDINGSDIR = "/srv/storage2/videos/TVRecordings/" # TODO move this to settings
 
 def ShowHelp():
-    print 'TVEncoder.py -p -n <number of files to prepare for processing> - prepare n recordings'
-    print 'TVEncoder.py -p -l -n <number of files to process> - lists the files that will be processed without actually encoding them'
+    print 'TVEncoder.py -p -n <number of files to prepare for processing> ' \
+          '- prepare n recordings'
+    print 'TVEncoder.py -p -l -n <number of files to process> - lists the ' \
+          'files that will be processed without actually encoding them'
     print 'TVEncoder.py -e - encode the files that have been processed'
     print 'TVEncoder.py -e -l - list the files that would be encoded'
 
+
 def PrintShowsToEncode(showsData):
 #    print "/n".join(showData)
     for showData in showsData:
         print showData.ToString()
 
+
 def PrintShowsToPrepare(showsData):
     for showData in showsData:
         showData.Print()
 
+
 def main(argv):
     numFiles = 0
     doEncode = False
     readOnly = False
     doList = False
-    
+
     try:
-       opts, args = getopt.getopt(argv,"hlpen:")
+        opts, args = getopt.getopt(argv, "hlpen:")
     except getopt.GetoptError:
-       ShowHelp()
-       sys.exit(2)
+        ShowHelp()
+        sys.exit(2)
     for opt, arg in opts:
-       if opt == '-h':
-          ShowHelp()
-          sys.exit()
-       elif opt == "-p":
-           doEncode = False
-       elif opt == "-e":
-           doEncode = True
-       elif opt == "-n":
-          numFiles = arg
-       elif opt == "-l":
-          readOnly = True
-          doList = True
-    
+        if opt == '-h':
+            ShowHelp()
+            sys.exit()
+        elif opt == "-p":
+            doEncode = False
+        elif opt == "-e":
+            doEncode = True
+        elif opt == "-n":
+            numFiles = arg
+        elif opt == "-l":
+            readOnly = True
+            doList = True
+
     settings = Settings("settings.cfg")
 
     if readOnly and doList:
@@ -65,10 +68,6 @@ def main(argv):
             PrintShowsToEncode(showData)
         else:
             # Generate the list of files to process
-#            tempShowList = ["Thomas and Friends", "Thomas the Tank Engine & Friends", 
-#                            "Chuggington", "Mike the Knight", "Octonauts", 
-#                            "The Octonauts", "In the Night Garden", 
-#                            "Raa Raa! The Noisy Lion"] # TODO get from settings
             fileManager = FileManager(settings)
             shows = fileManager.GetFilesToPrepare(numFiles)
             print "num results: {0}".format(len(shows))
@@ -78,21 +77,24 @@ def main(argv):
             #Encode the files and move them to their final destination
             fileManager = FileManager(settings)
             showData = fileManager.GetEncodingFiles(readOnly)
-            
+
             for show in showData:
                 if fileManager.CheckFileExists(show.outputFile):
-                    print "File {0} already exists. Cannot process.".format(show.outputFile)
+                    print "File {0} already exists. Cannot process." \
+                        .format(show.outputFile)
                 else:
                     encoder = Encoder(settings.HandbrakeCommand())
                     result = encoder.Encode(show.inputFile, show.outputFile)
-                    
-                    fileManager.PerformPostEncodeFileOperations(show.inputFile, show.outputFile)
+
+                    fileManager.PerformPostEncodeFileOperations(
+                        show.inputFile, show.outputFile)
         else:
             # TODO Process files for encoding
-            fileManager = FileManager(settings)        
+            fileManager = FileManager(settings)
             shows = fileManager.GetFilesToPrepare(numFiles)
             tvData = TVData(settings)
             tvData.PrepareEpisodes(shows)
 
+
 if __name__ == "__main__":
     main(sys.argv[1:])