some pep8 tidying