PEP8 Code Cleanup