diff --git a/ChangeLog b/ChangeLog
index 59aca0e..5a1860e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-04-09  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* morituri/image/table.py:
+	* morituri/program/cdparanoia.py:
+	  Do some 80 character cleanups.
+
 2010-04-08  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* morituri/rip/image.py:
diff --git a/morituri/image/table.py b/morituri/image/table.py
index 1fc9dfd..dbdc9d2 100644
--- a/morituri/image/table.py
+++ b/morituri/image/table.py
@@ -80,7 +80,8 @@ class Track:
         self.indexes = {}
         self.cdtext = {}
 
-    def index(self, number, absolute=None, path=None, relative=None, counter=None):
+    def index(self, number, absolute=None, path=None, relative=None,
+              counter=None):
         """
         @type path:  unicode or None
         """
@@ -127,7 +128,8 @@ class Index:
     relative = None
     counter = None
 
-    def __init__(self, number, absolute=None, path=None, relative=None, counter=None):
+    def __init__(self, number, absolute=None, path=None, relative=None,
+                 counter=None):
 
         if path is not None:
             assert type(path) is unicode, "%r is not unicode" % path
diff --git a/morituri/program/cdparanoia.py b/morituri/program/cdparanoia.py
index 5961eb0..831ed0b 100644
--- a/morituri/program/cdparanoia.py
+++ b/morituri/program/cdparanoia.py
@@ -115,7 +115,8 @@ class ProgressParser(object):
         if frameOffset > self.read:
             delta = frameOffset - self.read
             if self._nframes and delta != self._nframes:
-                # print 'THOMAS: Read %d frames more, not %d' % (delta, self._nframes)
+                # print 'THOMAS: Read %d frames more, not %d' % (
+                # delta, self._nframes)
                 # my drive either reads 7 or 13 frames
                 pass
 
@@ -340,7 +341,8 @@ class ReadVerifyTrackTask(task.MultiSeparateTask):
     _tmpwavpath = None
     _tmppath = None
 
-    def __init__(self, path, table, start, stop, offset=0, device=None, profile=None, taglist=None):
+    def __init__(self, path, table, start, stop, offset=0, device=None,
+                 profile=None, taglist=None):
         """
         @param path:    where to store the ripped track
         @type  path:    str