flake8 fixes
Added TODO