don't want to nit but since this is mostly a cleanup PR, I've been told that docstrings should always be in the imperative, like you're telling the function what to do. Not stated explicitly in pep8, but I like it: http://www.python.org/dev/peps/pep-0008/#documentation-strings