code clean
Merge branch 'refactorthesis' code clean 后 merge，希望这是最后一次merge