PEP 8 Cleanup