Addressing comments from code review