code review:refactor