Clean up code
Merge branch 'master' of https://github.com/dayiwei/Per10-Da-To-be-named