More changes to make pep8 happier