Clean up PEP8