Code cleaning
Merge pull request #1242 from linzongshu/article

Code cleaning