pep8 and copy changes