code & TODO clean
Merge branch 'master' of https://github.com/withitergroup/quhao