Modify due to changes in pep8