cleanup and testing
pep8