Cleanup PEP8 code