PEP8 cleanups

Basic stuff, no functional changes.