Cleanup for PEP 8