Modify to match changes in pep8