[IMP] flake8 cleanup