[pep8] Better coherence