major cleanup of depricated files and pep8
more pep8