Clean code.
Merge branch 'changes' of https://github.com/gaohao/peernet-client into finaltest
Merged