some pep8 improvements