pep8 change and .mailmap modification