A bunch more updates - mostly indentation - to match PyCharm

Optional: these changes eliminate the warnings emitted by default by PyCharm (mostly conforming to the PEP project). E.g. number of blank lines, indentation of continuation lines.

No code changes.