pep8 fixes
pep8 fixes
cleanup code and fixed a bug
cleanup code
code cleanup and pep8 fixes
pep8 fixes
code cleanup