pep8 compliance, almost entirely whitespace changes.