pep8 cleanup
Updated TODO