updates for pep8, minus line-length