Code cleaning.
Pep8 code cleanup.
Yet more cleanup.