Began some PEP8 / pyflakes-inspired code cleanup.