Please don't mix pure PEP8 and functional changes in the same PR. It makes reviewing more difficult.