pep8 and other cleanup