refactor some code
Merge branch 'master' of github.com:daifu/Achievements-Dashboard