pep8 + some more TODOs