In future please keep unrelated PEP8 changes in a separate commit.