Remove a line continuation and an overly long line
Fixes to comments and docstrings
Get rid of one indentation level