Reacting to pep8 warnings.

Mostly indentation changes, best viewed with whitespace changes ignored.
(#226)