clean up code
Merge pull request #113 from DIdiHL/chenxi

clean up code