Refactoring/xiaochen yang/group1