diff --git a/.gitignore b/.gitignore
index d845a4e..104a196 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,7 @@ __pycache__
 .pytest_cache
 .tox
 MANIFEST
+
+# IDE
+.idea
+.idea/*
diff --git a/splits/readers.py b/splits/readers.py
index a27ac6a..6e1e01e 100644
--- a/splits/readers.py
+++ b/splits/readers.py
@@ -1,6 +1,3 @@
-from splits.util import path_for_part
-
-
 class SplitReader(object):
     def __init__(self,
                  manifest_path_or_list,
@@ -87,7 +84,7 @@ def readline(self, limit=None):
                 else:
                     line += new_data
 
-                if limit > 0 and len(line) == limit:
+                if 0 < limit == len(line):
                     break
                 elif line.endswith('\n'):
                     break
@@ -96,7 +93,7 @@ def readline(self, limit=None):
 
         return line
 
-    def readlines(self, sizehint=None):
+    def readlines(self):
         all_lines = []
         line = self.readline()
 
diff --git a/splits/s3.py b/splits/s3.py
index ff4a003..d10ba81 100644
--- a/splits/s3.py
+++ b/splits/s3.py
@@ -3,7 +3,6 @@
 import boto.s3
 import boto.s3.connection
 import boto.provider
-import zipfile
 import six.moves.urllib as urllib
 from itertools import groupby
 
diff --git a/splits/writers.py b/splits/writers.py
index 02e49c3..26d8f0b 100644
--- a/splits/writers.py
+++ b/splits/writers.py
@@ -1,5 +1,3 @@
-import os
-
 from splits.util import path_for_part
 
 
diff --git a/test/test_readers.py b/test/test_readers.py
index 22cf2c9..db82d5a 100644
--- a/test/test_readers.py
+++ b/test/test_readers.py
@@ -30,7 +30,7 @@ def test_read(self):
         for index, x in enumerate(lines.split('\n')):
             self.assertEquals(x, str(index))
 
-    def test_read_n_chars(self):
+    def test_read_n_chars_1(self):
         for index, x in enumerate(range(0, 19)):
             char = self.reader.read(1)
             if index % 2 == 0:
@@ -40,7 +40,7 @@ def test_read_n_chars(self):
 
         self.assertEquals(self.reader.read(1), '')
 
-    def test_read_n_chars(self):
+    def test_read_n_chars_2(self):
         chars = self.reader.read(11)
         self.assertEquals(chars, '0\n1\n2\n3\n4\n5')