more pep8 & deprecation cleanup