assorted PEP 8 fixes; mostly inline whitespace