I think I'd prefer not to make the PEP8 changes, the existing style seems fine to me.