Refactoring based on code review comment