Refactoring by huangqi