code review refac