flake8 cleanups
Merge branch 'master' into closet
remove unused class member