auto PEP8 fix by pycharm
restructure, need test
change server calling
minor change
minor bug fix