PEP-8 fixes

Some of these changes do increase vertical whitespace a tad but I do think it's helpful to have the common standard, so here are the edits required to pass pep8.  Tested with Py 2.x and 3.