Modify to be pep8 compliant