More updates to PEP8