Address comment in code review