working
more cleanup
more cleanup
pep8