BLD: pep8 major changes