code review refactoring