PEP8 Cleanup; mainly whitespace