various pep8 adjustments