Misc PEP8 fixes

Ugh. Is this really prescribed by PEP8? I like my docstrings with my functions/classes!