Code cleaning
Merge branch 'master' of https://github.com/huze0001/artutor.sg