diff --git a/onetimepad.py b/onetimepad.py
index a535d41..00e96ea 100644
--- a/onetimepad.py
+++ b/onetimepad.py
@@ -49,7 +49,7 @@ def _padfill(text, pad):
             continue
         else:
             padlines[lineno] = textlines.pop(0) if textlines[1:] else ''
-    return '\n'.join(padlines)
+    return padlines
 
 
 def _get_textwidth(text):
diff --git a/test_onetimepad.py b/test_onetimepad.py
index 680b83a..55eb536 100644
--- a/test_onetimepad.py
+++ b/test_onetimepad.py
@@ -38,10 +38,8 @@ class TestOneTimePad(unittest.TestCase):
         msg = self.msg[:]
         pad = OT.create_pad(len(msg))
         filled = OT._padfill(msg, pad)
-        # print filled
-        # raise Exception
         self.assertTrue(bool(filled))
-        for lineno, line in enumerate(filled.splitlines()):
+        for lineno, line in enumerate(filled):
             line = line.strip()
             if OT._is_cypherline(lineno):
                 self.assertFalse(bool(len(line)),