pep8 fixes & cleanup