Cleanup PEP8