Continued PEP8 code cleanup.