Final Clean up
Merge pull request #112 from DIdiHL/zhaoyue

Final Clean up