refactor codeschool
Merge branch 'wangxiaomo/refactor_codeschool'