Clean code
Merge pull request #213 from v11985/data2

Clean code ->yuanzhe