PEP8 fixes.

Mostly code formatting, shortening lines, white-space fixes.