fixed merging pep8 errors