Flake8 fixes and notations