PEP-8 changes.
An extra todo