diff --git a/mopidy/frontends/mpd/translator.py b/mopidy/frontends/mpd/translator.py
index 099b9551..3ead23c7 100644
--- a/mopidy/frontends/mpd/translator.py
+++ b/mopidy/frontends/mpd/translator.py
@@ -46,9 +46,11 @@ def track_to_mpd_format(track, position=None, cpid=None):
     # FIXME don't use first and best artist?
     # FIXME don't duplicate following code?
     if track.album is not None and track.album.artists:
-        artists = filter(lambda a: a.musicbrainz_id is not None, track.album.artists)
+        artists = filter(lambda a: a.musicbrainz_id is not None,
+            track.album.artists)
         if artists:
-            result.append(('MUSICBRAINZ_ALBUMARTISTID', artists[0].musicbrainz_id))
+            result.append(
+                ('MUSICBRAINZ_ALBUMARTISTID', artists[0].musicbrainz_id))
     if track.artists:
         artists = filter(lambda a: a.musicbrainz_id is not None, track.artists)
         if artists:
diff --git a/mopidy/models.py b/mopidy/models.py
index 915dc92a..8e7585f1 100644
--- a/mopidy/models.py
+++ b/mopidy/models.py
@@ -61,7 +61,8 @@ class ImmutableObject(object):
             if hasattr(self, key):
                 data[key] = values.pop(key)
         if values:
-            raise TypeError("copy() got an unexpected keyword argument '%s'" % key)
+            raise TypeError("copy() got an unexpected keyword argument '%s'"
+                % key)
         return self.__class__(**data)
 
 class Artist(ImmutableObject):