Flake8 fixes and additional comments