Remove threading from main
Fix style conventions warnings
Merge branch 'master' into networkx