code review refactor