diff --git a/headphones/albumswitcher.py b/headphones/albumswitcher.py
index 8ac8ed84..30063b24 100644
--- a/headphones/albumswitcher.py
+++ b/headphones/albumswitcher.py
@@ -16,15 +16,19 @@
 import headphones
 from headphones import db, logger, cache
 
+
 def switch(AlbumID, ReleaseID):
     '''
     Takes the contents from allalbums & alltracks (based on ReleaseID) and switches them into
     the albums & tracks table.
     '''
     myDB = db.DBConnection()
-    oldalbumdata = myDB.action('SELECT * from albums WHERE AlbumID=?', [AlbumID]).fetchone()
-    newalbumdata = myDB.action('SELECT * from allalbums WHERE ReleaseID=?', [ReleaseID]).fetchone()
-    newtrackdata = myDB.action('SELECT * from alltracks WHERE ReleaseID=?', [ReleaseID]).fetchall()
+    oldalbumdata = myDB.action(
+        'SELECT * from albums WHERE AlbumID=?', [AlbumID]).fetchone()
+    newalbumdata = myDB.action(
+        'SELECT * from allalbums WHERE ReleaseID=?', [ReleaseID]).fetchone()
+    newtrackdata = myDB.action(
+        'SELECT * from alltracks WHERE ReleaseID=?', [ReleaseID]).fetchall()
     myDB.action('DELETE from tracks WHERE AlbumID=?', [AlbumID])
 
     controlValueDict = {"AlbumID":  AlbumID}
@@ -38,7 +42,7 @@ def switch(AlbumID, ReleaseID):
                     "Type":             newalbumdata['Type'],
                     "ReleaseCountry":   newalbumdata['ReleaseCountry'],
                     "ReleaseFormat":    newalbumdata['ReleaseFormat']
-                }
+                    }
 
     myDB.upsert("albums", newValueDict, controlValueDict)
 
@@ -53,35 +57,40 @@ def switch(AlbumID, ReleaseID):
                             "AlbumID":  AlbumID}
 
         newValueDict = {"ArtistID":     track['ArtistID'],
-                    "ArtistName":       track['ArtistName'],
-                    "AlbumTitle":       track['AlbumTitle'],
-                    "AlbumASIN":        track['AlbumASIN'],
-                    "ReleaseID":        track['ReleaseID'],
-                    "TrackTitle":       track['TrackTitle'],
-                    "TrackDuration":    track['TrackDuration'],
-                    "TrackNumber":      track['TrackNumber'],
-                    "CleanName":        track['CleanName'],
-                    "Location":         track['Location'],
-                    "Format":           track['Format'],
-                    "BitRate":          track['BitRate']
-                    }
+                        "ArtistName":       track['ArtistName'],
+                        "AlbumTitle":       track['AlbumTitle'],
+                        "AlbumASIN":        track['AlbumASIN'],
+                        "ReleaseID":        track['ReleaseID'],
+                        "TrackTitle":       track['TrackTitle'],
+                        "TrackDuration":    track['TrackDuration'],
+                        "TrackNumber":      track['TrackNumber'],
+                        "CleanName":        track['CleanName'],
+                        "Location":         track['Location'],
+                        "Format":           track['Format'],
+                        "BitRate":          track['BitRate']
+                        }
 
         myDB.upsert("tracks", newValueDict, controlValueDict)
 
-    # Mark albums as downloaded if they have at least 80% (by default, configurable) of the album
+    # Mark albums as downloaded if they have at least 80% (by default,
+    # configurable) of the album
     total_track_count = len(newtrackdata)
-    have_track_count = len(myDB.select('SELECT * from tracks WHERE AlbumID=? AND Location IS NOT NULL', [AlbumID]))
+    have_track_count = len(myDB.select(
+        'SELECT * from tracks WHERE AlbumID=? AND Location IS NOT NULL', [AlbumID]))
 
-    if oldalbumdata['Status'] == 'Skipped' and ((have_track_count/float(total_track_count)) >= (headphones.CONFIG.ALBUM_COMPLETION_PCT/100.0)):
-        myDB.action('UPDATE albums SET Status=? WHERE AlbumID=?', ['Downloaded', AlbumID])
+    if oldalbumdata['Status'] == 'Skipped' and ((have_track_count / float(total_track_count)) >= (headphones.CONFIG.ALBUM_COMPLETION_PCT / 100.0)):
+        myDB.action(
+            'UPDATE albums SET Status=? WHERE AlbumID=?', ['Downloaded', AlbumID])
 
     # Update have track counts on index
-    totaltracks = len(myDB.select('SELECT TrackTitle from tracks WHERE ArtistID=? AND AlbumID IN (SELECT AlbumID FROM albums WHERE Status != "Ignored")', [newalbumdata['ArtistID']]))
-    havetracks = len(myDB.select('SELECT TrackTitle from tracks WHERE ArtistID=? AND Location IS NOT NULL', [newalbumdata['ArtistID']]))
+    totaltracks = len(myDB.select(
+        'SELECT TrackTitle from tracks WHERE ArtistID=? AND AlbumID IN (SELECT AlbumID FROM albums WHERE Status != "Ignored")', [newalbumdata['ArtistID']]))
+    havetracks = len(myDB.select(
+        'SELECT TrackTitle from tracks WHERE ArtistID=? AND Location IS NOT NULL', [newalbumdata['ArtistID']]))
 
     controlValueDict = {"ArtistID":     newalbumdata['ArtistID']}
 
-    newValueDict = {    "TotalTracks":      totaltracks,
-                        "HaveTracks":       havetracks}
+    newValueDict = {"TotalTracks":      totaltracks,
+                    "HaveTracks":       havetracks}
 
     myDB.upsert("artists", newValueDict, controlValueDict)