Several small fixes to be more PEP8 compliant (while not completely on purpose).
There are no functional changes.