more changes to make pep8 happy