remove todos. Clenaup todo list
PEP / coding cleanup - untested
more cleanup. all tests passed
more cleanup